diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore index 6f97b5dc0d..93398c04aa 100644 --- a/deps/npm/.npmignore +++ b/deps/npm/.npmignore @@ -28,3 +28,5 @@ html/*.png *.pyc /test/tap/builtin-config + +.nyc_output diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 2a76de5f20..6eb95dbebd 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -398,3 +398,7 @@ Rachel Evans Sam Minnee Zirak Daniel Lupu +Gianluca Casati +AndrΓ© Herculano +Wyatt Preul +Myles Borins diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md index 20a42d1676..9b5a0323d0 100644 --- a/deps/npm/CHANGELOG.md +++ b/deps/npm/CHANGELOG.md @@ -1,3 +1,94 @@ +### v3.9.5 (2016-05-27): + +Just a quick point release. We had an issue where I (Kat) included the +`.nyc_output/` directory in `npm@3.9.3` and `npm@3.9.4`. The issue got reported +right after that second release +([`#12873`](https://github.com/npm/npm/issues/12873)), and now there's this +small point release that's there to fix the issue sooner. + +* [`f96aea0`](https://github.com/npm/npm/commit/f96aea085be981cdb59bd09f16da40717426f981) + [#12878](https://github.com/npm/npm/pull/12878) + Ignore `.nyc_output` to avoid an accidental publish or commit filled with + code coverage data. + ([@TheAlphaNerd](https://github.com/TheAlphaNerd)) + +### v3.9.4 (2016-05-26): + +Hey all! It's that time again! + +This week continues our current `big-bug` squashing push, although there's none +that are ready to release quite yet -- we're working on it! + +It's also worth noting that we're entering the main part of conference season, +so you can probably expect a bit of a dev slowdown as a lot of us wombats attend +or speak at the various conferences. Remember [npm.camp](npm.camp) is happening +in 2 months and the lineup is looking pretty great! Tickets are still on sale. +Come hang out with us! WOO FUN! πŸŽ‰πŸ˜Έ + +#### BUGFIX + +* [`cac0038`](https://github.com/npm/npm/commit/cac0038868b18295f9f299e762e20034f32a3e11) + [#12845](https://github.com/npm/npm/pull/12845) + Progress bar during tarball packing now prints `pack:packagename` instead of + `pack:[object Object]`. + ([@iarna](https://github.com/iarna)) + +#### DOC UPDATES + +* [`0b81622`](https://github.com/npm/npm/commit/0b816225c743c9203db5d92fb4dd3a9293833298) + [#12840](https://github.com/npm/npm/pull/12840) + Remove sexualized language from comment in code. + ([@geek](https://github.com/geek)) +* [`d6dff24`](https://github.com/npm/npm/commit/d6dff2481cb587c392f22afb893ac3136371a64c) + [#12802](https://github.com/npm/npm/pull/12802) + Small grammar fix in `cli/npm.md`. + ([@andresilveira](https://github.com/andresilveira)) +* [`cb38e0f`](https://github.com/npm/npm/commit/cb38e0fff82a6c1c110026b95b07a8c32e27ec01) + [#12782](https://github.com/npm/npm/pull/12782) + Documents that `NOTICE` files started getting included after + [npm/fstream-npm#17](https://github.com/npm/fstream-npm/pull/17). + ([@SimenB](https://github.com/SimenB)) +* [`70a3ae4`](https://github.com/npm/npm/commit/70a3ae4d4ec76b3ec51f00bf5261f1147829f9fe) + [#12776](https://github.com/npm/npm/pull/12776) + `npm run-script` used to have a `` argument that allowed you to target + specific packages' scripts. This was removed as one of the breaking changes + for `npm@2`. + This patch removes a mention of that argument, which really doesn't exist + anymore. + ([@fibo](https://github.com/fibo)) + +#### DEP UPDATES + +* [`4a4470d`](https://github.com/npm/npm/commit/4a4470ddd1d9b0b62cb94f3bff5ab6b8e6db527a) + `aproba@1.0.3` + ([@iarna](https://github.com/iarna)) + +#### TEST IMPROVEMENTS + +So it turns out, `t.comment` in `tap` is actually pretty nice! +There's also a couple other test improvements by Rebecca landing here. + +* [`9fd04dd`](https://github.com/npm/npm/commit/9fd04dd6be493465d7ac5f14dd9328e66069c1bf) + [#12851](https://github.com/npm/npm/pull/12851) + Rewrite `shrinkwrap-prod-dependency-also` test to use `common.npm` + ([@iarna](https://github.com/iarna)) +* [`3bc4a8e`](https://github.com/npm/npm/commit/3bc4a8ee58cb0e0adc84b4f135330f2b1e20d992) + [#12851](https://github.com/npm/npm/pull/12851) + Clean up `rm-linked` test. + ([@iarna](https://github.com/iarna)) +* [`bf7f7f2`](https://github.com/npm/npm/commit/bf7f7f273a794f7573bbbc84b1c216fdcd9e0ef9) + [#12851](https://github.com/npm/npm/pull/12851) + Clean up `outdated-symlink` test. + ([@iarna](https://github.com/iarna)) +* [`ca0baa4`](https://github.com/npm/npm/commit/ca0baa4dac85b1df4e26ef0c73d39314ca6858ca) + [#12851](https://github.com/npm/npm/pull/12851) + Improve diagnostics for `shrinkwrap-scoped-auth` test. + ([@iarna](https://github.com/iarna)) +* [`fbec9fd`](https://github.com/npm/npm/commit/fbec9fd5bb0abce589120d14c1f2b03b58cecce1) + [#12851](https://github.com/npm/npm/pull/12851) + Rewrite `shrinkwrap-dev-dependency` test to use `common.npm`. + ([@iarna](https://github.com/iarna)) + ### v3.9.3 (2016-05-19): This week continues our `big-bug` squashing adventure! Things are churning along diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index 31c9b18af7..ec867e5f9e 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -41,7 +41,7 @@ requires compiling of C++ Code, npm will use [node-gyp](https://github.com/TooTallNate/node-gyp) for that task. For a Unix system, [node-gyp](https://github.com/TooTallNate/node-gyp) needs Python, make and a buildchain like GCC. On Windows, -Python and Microsoft Visual Studio C++ is needed. Python 3 is +Python and Microsoft Visual Studio C++ are needed. Python 3 is not supported by [node-gyp](https://github.com/TooTallNate/node-gyp). For more information visit [the node-gyp repository](https://github.com/TooTallNate/node-gyp) and diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index af7fb8a536..a52f9f011d 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -183,9 +183,10 @@ Certain files are always included, regardless of settings: * `README` * `CHANGES` / `CHANGELOG` / `HISTORY` * `LICENSE` / `LICENCE` +* `NOTICE` * The file in the "main" field -`README`, `CHANGES` & `LICENSE` can have any case and extension. +`README`, `CHANGES`, `LICENSE` & `NOTICE` can have any case and extension. Conversely, some files are always ignored: diff --git a/deps/npm/doc/misc/npm-scripts.md b/deps/npm/doc/misc/npm-scripts.md index 3164715d98..972ba90bc5 100644 --- a/deps/npm/doc/misc/npm-scripts.md +++ b/deps/npm/doc/misc/npm-scripts.md @@ -34,7 +34,7 @@ following scripts: stop and start scripts if no `restart` script is provided. Additionally, arbitrary scripts can be executed by running `npm -run-script `. *Pre* and *post* commands with matching +run-script `. *Pre* and *post* commands with matching names will be run for those as well (e.g. `premyscript`, `myscript`, `postmyscript`). diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index d8a75cce97..cb2ac11494 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -126,5 +126,5 @@ will no doubt tell you to put the output in a gist or email.

       - + diff --git a/deps/npm/html/doc/cli/npm-access.html b/deps/npm/html/doc/cli/npm-access.html index 1ba078beb9..b6c21bf5d6 100644 --- a/deps/npm/html/doc/cli/npm-access.html +++ b/deps/npm/html/doc/cli/npm-access.html @@ -84,5 +84,5 @@ with an HTTP 402 status code (logically enough), unless you use        - + diff --git a/deps/npm/html/doc/cli/npm-adduser.html b/deps/npm/html/doc/cli/npm-adduser.html index e6135b2d24..2ccc693d0f 100644 --- a/deps/npm/html/doc/cli/npm-adduser.html +++ b/deps/npm/html/doc/cli/npm-adduser.html @@ -72,5 +72,5 @@ over any global configuration.

       - + diff --git a/deps/npm/html/doc/cli/npm-bin.html b/deps/npm/html/doc/cli/npm-bin.html index f838c7ec04..7d68f93fb4 100644 --- a/deps/npm/html/doc/cli/npm-bin.html +++ b/deps/npm/html/doc/cli/npm-bin.html @@ -35,5 +35,5 @@        - + diff --git a/deps/npm/html/doc/cli/npm-bugs.html b/deps/npm/html/doc/cli/npm-bugs.html index 43e6ad0a00..19df5f7696 100644 --- a/deps/npm/html/doc/cli/npm-bugs.html +++ b/deps/npm/html/doc/cli/npm-bugs.html @@ -55,5 +55,5 @@ a package.json in the current folder and use the name        - + diff --git a/deps/npm/html/doc/cli/npm-build.html b/deps/npm/html/doc/cli/npm-build.html index 29dc60289d..e551d1a5e3 100644 --- a/deps/npm/html/doc/cli/npm-build.html +++ b/deps/npm/html/doc/cli/npm-build.html @@ -40,5 +40,5 @@ directly, run:

       - + diff --git a/deps/npm/html/doc/cli/npm-bundle.html b/deps/npm/html/doc/cli/npm-bundle.html index 5bb20102c8..c1c4f21cfa 100644 --- a/deps/npm/html/doc/cli/npm-bundle.html +++ b/deps/npm/html/doc/cli/npm-bundle.html @@ -31,5 +31,5 @@ install packages into the local space.

       - + diff --git a/deps/npm/html/doc/cli/npm-cache.html b/deps/npm/html/doc/cli/npm-cache.html index fcf9fa3b0c..c6113347df 100644 --- a/deps/npm/html/doc/cli/npm-cache.html +++ b/deps/npm/html/doc/cli/npm-cache.html @@ -81,5 +81,5 @@ they do not make an HTTP request to the registry.

       - + diff --git a/deps/npm/html/doc/cli/npm-completion.html b/deps/npm/html/doc/cli/npm-completion.html index 7b78e9e468..e24db0e622 100644 --- a/deps/npm/html/doc/cli/npm-completion.html +++ b/deps/npm/html/doc/cli/npm-completion.html @@ -43,5 +43,5 @@ completions based on the arguments.

       - + diff --git a/deps/npm/html/doc/cli/npm-config.html b/deps/npm/html/doc/cli/npm-config.html index 7495ef9a3b..17dfb2b07d 100644 --- a/deps/npm/html/doc/cli/npm-config.html +++ b/deps/npm/html/doc/cli/npm-config.html @@ -67,5 +67,5 @@ global config.

       - + diff --git a/deps/npm/html/doc/cli/npm-dedupe.html b/deps/npm/html/doc/cli/npm-dedupe.html index 58b4be2955..e138ec02e8 100644 --- a/deps/npm/html/doc/cli/npm-dedupe.html +++ b/deps/npm/html/doc/cli/npm-dedupe.html @@ -61,5 +61,5 @@ result in new modules being installed.

       - + diff --git a/deps/npm/html/doc/cli/npm-deprecate.html b/deps/npm/html/doc/cli/npm-deprecate.html index 2ee07776d9..56fbb309b8 100644 --- a/deps/npm/html/doc/cli/npm-deprecate.html +++ b/deps/npm/html/doc/cli/npm-deprecate.html @@ -38,5 +38,5 @@ something like this:

       - + diff --git a/deps/npm/html/doc/cli/npm-dist-tag.html b/deps/npm/html/doc/cli/npm-dist-tag.html index 5938cbc315..5d6420a4b9 100644 --- a/deps/npm/html/doc/cli/npm-dist-tag.html +++ b/deps/npm/html/doc/cli/npm-dist-tag.html @@ -87,5 +87,5 @@ begin with a number or the letter v.

       - + diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html index 221da6b9a5..12827e099d 100644 --- a/deps/npm/html/doc/cli/npm-docs.html +++ b/deps/npm/html/doc/cli/npm-docs.html @@ -56,5 +56,5 @@ the current folder and use the name property.

       - + diff --git a/deps/npm/html/doc/cli/npm-edit.html b/deps/npm/html/doc/cli/npm-edit.html index 2303e31e7c..e5dd497141 100644 --- a/deps/npm/html/doc/cli/npm-edit.html +++ b/deps/npm/html/doc/cli/npm-edit.html @@ -49,5 +49,5 @@ or "notepad" on Windows.        - + diff --git a/deps/npm/html/doc/cli/npm-explore.html b/deps/npm/html/doc/cli/npm-explore.html index dc369cc353..e1dc8657aa 100644 --- a/deps/npm/html/doc/cli/npm-explore.html +++ b/deps/npm/html/doc/cli/npm-explore.html @@ -49,5 +49,5 @@ Windows        - + diff --git a/deps/npm/html/doc/cli/npm-help-search.html b/deps/npm/html/doc/cli/npm-help-search.html index 251d15f1ae..50be2a7fbc 100644 --- a/deps/npm/html/doc/cli/npm-help-search.html +++ b/deps/npm/html/doc/cli/npm-help-search.html @@ -45,5 +45,5 @@ where the terms were found in the documentation.

       - + diff --git a/deps/npm/html/doc/cli/npm-help.html b/deps/npm/html/doc/cli/npm-help.html index 16aa7f74c0..230dd39a81 100644 --- a/deps/npm/html/doc/cli/npm-help.html +++ b/deps/npm/html/doc/cli/npm-help.html @@ -50,5 +50,5 @@ matches are equivalent to specifying a topic name.

       - + diff --git a/deps/npm/html/doc/cli/npm-init.html b/deps/npm/html/doc/cli/npm-init.html index 8378206733..9f0299102e 100644 --- a/deps/npm/html/doc/cli/npm-init.html +++ b/deps/npm/html/doc/cli/npm-init.html @@ -48,5 +48,5 @@ defaults and not prompt you for any options.

       - + diff --git a/deps/npm/html/doc/cli/npm-install-test.html b/deps/npm/html/doc/cli/npm-install-test.html index 9b8f31b37e..9dfe6e6258 100644 --- a/deps/npm/html/doc/cli/npm-install-test.html +++ b/deps/npm/html/doc/cli/npm-install-test.html @@ -42,4 +42,4 @@ takes exactly the same arguments as npm install.

       - + diff --git a/deps/npm/html/doc/cli/npm-install.html b/deps/npm/html/doc/cli/npm-install.html index d0d91f6574..5721550575 100644 --- a/deps/npm/html/doc/cli/npm-install.html +++ b/deps/npm/html/doc/cli/npm-install.html @@ -312,5 +312,5 @@ affects a real use-case, it will be investigated.

       - + diff --git a/deps/npm/html/doc/cli/npm-link.html b/deps/npm/html/doc/cli/npm-link.html index b059f3d24b..77796a29a8 100644 --- a/deps/npm/html/doc/cli/npm-link.html +++ b/deps/npm/html/doc/cli/npm-link.html @@ -73,5 +73,5 @@ include that scope, e.g.

       - + diff --git a/deps/npm/html/doc/cli/npm-logout.html b/deps/npm/html/doc/cli/npm-logout.html index e941a8e64d..1c9b74872b 100644 --- a/deps/npm/html/doc/cli/npm-logout.html +++ b/deps/npm/html/doc/cli/npm-logout.html @@ -51,5 +51,5 @@ it takes precedence.

       - + diff --git a/deps/npm/html/doc/cli/npm-ls.html b/deps/npm/html/doc/cli/npm-ls.html index 6e0645ba50..5f17c5a7f6 100644 --- a/deps/npm/html/doc/cli/npm-ls.html +++ b/deps/npm/html/doc/cli/npm-ls.html @@ -21,7 +21,7 @@ installed, as well as their dependencies, in a tree-structure.

limit the results to only the paths to the packages named. Note that nested packages will also show the paths to the specified packages. For example, running npm ls promzard in npm's source tree will show:

-
npm@3.9.3 /path/to/npm
+
npm@3.9.5 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 
It will print out extraneous, missing, and invalid packages.

@@ -104,5 +104,5 @@ project.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-outdated.html b/deps/npm/html/doc/cli/npm-outdated.html
index d1abeec7c9..43339f7f86 100644
--- a/deps/npm/html/doc/cli/npm-outdated.html
+++ b/deps/npm/html/doc/cli/npm-outdated.html
@@ -116,5 +116,5 @@ project.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-owner.html b/deps/npm/html/doc/cli/npm-owner.html
index ca54bbd494..34ec3a1cb8 100644
--- a/deps/npm/html/doc/cli/npm-owner.html
+++ b/deps/npm/html/doc/cli/npm-owner.html
@@ -51,5 +51,5 @@ that is not implemented at this time.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-pack.html b/deps/npm/html/doc/cli/npm-pack.html
index 331f878363..dd4a09d041 100644
--- a/deps/npm/html/doc/cli/npm-pack.html
+++ b/deps/npm/html/doc/cli/npm-pack.html
@@ -41,5 +41,5 @@ overwritten the second time.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-ping.html b/deps/npm/html/doc/cli/npm-ping.html
index d99f3a785a..404a83c6a3 100644
--- a/deps/npm/html/doc/cli/npm-ping.html
+++ b/deps/npm/html/doc/cli/npm-ping.html
@@ -32,4 +32,4 @@
   
    
 
-
+
diff --git a/deps/npm/html/doc/cli/npm-prefix.html b/deps/npm/html/doc/cli/npm-prefix.html
index 705cb7ef6e..243562b5bb 100644
--- a/deps/npm/html/doc/cli/npm-prefix.html
+++ b/deps/npm/html/doc/cli/npm-prefix.html
@@ -38,5 +38,5 @@ to contain a package.json file unless -g is also specified.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-prune.html b/deps/npm/html/doc/cli/npm-prune.html
index ad6df58f94..3c97535fd9 100644
--- a/deps/npm/html/doc/cli/npm-prune.html
+++ b/deps/npm/html/doc/cli/npm-prune.html
@@ -40,5 +40,5 @@ negate NODE_ENV being set to production.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-publish.html b/deps/npm/html/doc/cli/npm-publish.html
index 510934dd93..018380e14a 100644
--- a/deps/npm/html/doc/cli/npm-publish.html
+++ b/deps/npm/html/doc/cli/npm-publish.html
@@ -72,5 +72,5 @@ it is removed with npm-unpublish(1).

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-rebuild.html b/deps/npm/html/doc/cli/npm-rebuild.html
index 7aa72125c9..c5bcdab1e4 100644
--- a/deps/npm/html/doc/cli/npm-rebuild.html
+++ b/deps/npm/html/doc/cli/npm-rebuild.html
@@ -35,5 +35,5 @@ the new binary.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-repo.html b/deps/npm/html/doc/cli/npm-repo.html
index 415a6fc26c..d7efceb710 100644
--- a/deps/npm/html/doc/cli/npm-repo.html
+++ b/deps/npm/html/doc/cli/npm-repo.html
@@ -41,5 +41,5 @@ a package.json in the current folder and use the name
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-restart.html b/deps/npm/html/doc/cli/npm-restart.html
index 5ca681c9dc..ab3a817e83 100644
--- a/deps/npm/html/doc/cli/npm-restart.html
+++ b/deps/npm/html/doc/cli/npm-restart.html
@@ -53,5 +53,5 @@ behavior will be accompanied by an increase in major version number

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-root.html b/deps/npm/html/doc/cli/npm-root.html
index ba312bdfa6..ab40e4b344 100644
--- a/deps/npm/html/doc/cli/npm-root.html
+++ b/deps/npm/html/doc/cli/npm-root.html
@@ -35,5 +35,5 @@
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-run-script.html b/deps/npm/html/doc/cli/npm-run-script.html
index 598b7658e4..1b9c103991 100644
--- a/deps/npm/html/doc/cli/npm-run-script.html
+++ b/deps/npm/html/doc/cli/npm-run-script.html
@@ -63,5 +63,5 @@ you will be given a warning to run npm install, just in case you
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-search.html b/deps/npm/html/doc/cli/npm-search.html
index 55ccade815..2c300fe206 100644
--- a/deps/npm/html/doc/cli/npm-search.html
+++ b/deps/npm/html/doc/cli/npm-search.html
@@ -57,5 +57,5 @@ Pass a different registry url such as the default above in order to override thi
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-shrinkwrap.html b/deps/npm/html/doc/cli/npm-shrinkwrap.html
index 25d8744b0f..eb1b1f276b 100644
--- a/deps/npm/html/doc/cli/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/cli/npm-shrinkwrap.html
@@ -169,5 +169,5 @@ contents rather than versions.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-star.html b/deps/npm/html/doc/cli/npm-star.html
index 87229093b5..f4cde5652a 100644
--- a/deps/npm/html/doc/cli/npm-star.html
+++ b/deps/npm/html/doc/cli/npm-star.html
@@ -36,5 +36,5 @@ a vaguely positive way to show that you care.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stars.html b/deps/npm/html/doc/cli/npm-stars.html
index f1aa3beeb1..9d79cb387d 100644
--- a/deps/npm/html/doc/cli/npm-stars.html
+++ b/deps/npm/html/doc/cli/npm-stars.html
@@ -36,5 +36,5 @@ you will most certainly enjoy this command.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-start.html b/deps/npm/html/doc/cli/npm-start.html
index 591d0c4da4..1d8291d764 100644
--- a/deps/npm/html/doc/cli/npm-start.html
+++ b/deps/npm/html/doc/cli/npm-start.html
@@ -39,5 +39,5 @@ more details.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-stop.html b/deps/npm/html/doc/cli/npm-stop.html
index 4ec953de40..8792d034ae 100644
--- a/deps/npm/html/doc/cli/npm-stop.html
+++ b/deps/npm/html/doc/cli/npm-stop.html
@@ -34,5 +34,5 @@
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-tag.html b/deps/npm/html/doc/cli/npm-tag.html
index edf98f585c..5a7281f996 100644
--- a/deps/npm/html/doc/cli/npm-tag.html
+++ b/deps/npm/html/doc/cli/npm-tag.html
@@ -63,5 +63,5 @@ that do not begin with a number or the letter v.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-team.html b/deps/npm/html/doc/cli/npm-team.html
index b3a481f9f3..fd2f905f34 100644
--- a/deps/npm/html/doc/cli/npm-team.html
+++ b/deps/npm/html/doc/cli/npm-team.html
@@ -67,4 +67,4 @@ use the npm access command to grant or revoke the appropriate permi
   
    
 
-
+
diff --git a/deps/npm/html/doc/cli/npm-test.html b/deps/npm/html/doc/cli/npm-test.html
index 755d319cd5..4398089f50 100644
--- a/deps/npm/html/doc/cli/npm-test.html
+++ b/deps/npm/html/doc/cli/npm-test.html
@@ -38,5 +38,5 @@ true.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-uninstall.html b/deps/npm/html/doc/cli/npm-uninstall.html
index 93c940af07..7dca76e4a9 100644
--- a/deps/npm/html/doc/cli/npm-uninstall.html
+++ b/deps/npm/html/doc/cli/npm-uninstall.html
@@ -60,5 +60,5 @@ npm uninstall dtrace-provider --save-optional
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-unpublish.html b/deps/npm/html/doc/cli/npm-unpublish.html
index ea5e2c53b6..4b7dfaf77f 100644
--- a/deps/npm/html/doc/cli/npm-unpublish.html
+++ b/deps/npm/html/doc/cli/npm-unpublish.html
@@ -47,5 +47,5 @@ package again, a new version number must be used.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-update.html b/deps/npm/html/doc/cli/npm-update.html
index 76af599fd1..22aba1cc03 100644
--- a/deps/npm/html/doc/cli/npm-update.html
+++ b/deps/npm/html/doc/cli/npm-update.html
@@ -118,5 +118,5 @@ be downgraded.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-version.html b/deps/npm/html/doc/cli/npm-version.html
index 4baf12a64d..7c991ff328 100644
--- a/deps/npm/html/doc/cli/npm-version.html
+++ b/deps/npm/html/doc/cli/npm-version.html
@@ -100,5 +100,5 @@ and tag up to the server, and deletes the build/temp directory.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-view.html b/deps/npm/html/doc/cli/npm-view.html
index 714c32e6ae..06e3712262 100644
--- a/deps/npm/html/doc/cli/npm-view.html
+++ b/deps/npm/html/doc/cli/npm-view.html
@@ -86,5 +86,5 @@ the field name.

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm-whoami.html b/deps/npm/html/doc/cli/npm-whoami.html
index 7932350fbc..0ed957e1c4 100644
--- a/deps/npm/html/doc/cli/npm-whoami.html
+++ b/deps/npm/html/doc/cli/npm-whoami.html
@@ -33,5 +33,5 @@
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/cli/npm.html b/deps/npm/html/doc/cli/npm.html
index 9fb7db821e..e02ea4494f 100644
--- a/deps/npm/html/doc/cli/npm.html
+++ b/deps/npm/html/doc/cli/npm.html
@@ -13,7 +13,7 @@
 
SYNOPSIS

 
npm <command> [args]
 
VERSION

-
3.9.3

+
3.9.5

 
DESCRIPTION

 
npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency
@@ -36,7 +36,7 @@ requires compiling of C++ Code, npm will use
 node-gyp for that task.
 For a Unix system, node-gyp
 needs Python, make and a buildchain like GCC. On Windows,
-Python and Microsoft Visual Studio C++ is needed. Python 3 is
+Python and Microsoft Visual Studio C++ are needed. Python 3 is
 not supported by node-gyp.
 For more information visit
 the node-gyp repository and
@@ -126,7 +126,7 @@ will no doubt tell you to put the output in a gist or email.

 
Isaac Z. Schlueter ::
 isaacs ::
 @izs ::
-i@izs.me

+i@izs.me

 
SEE ALSO

 
-
README, CHANGES & LICENSE can have any case and extension.

+
README, CHANGES, LICENSE & NOTICE can have any case and extension.

 
Conversely, some files are always ignored:

 
    
 
  • .git
    • 
@@ -579,5 +580,5 @@ ignored.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html
index 14a406d25c..f620e5ab23 100644
--- a/deps/npm/html/doc/files/npmrc.html
+++ b/deps/npm/html/doc/files/npmrc.html
@@ -83,5 +83,5 @@ manner.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html
index abad06ab89..b656d28747 100644
--- a/deps/npm/html/doc/files/package.json.html
+++ b/deps/npm/html/doc/files/package.json.html
@@ -142,9 +142,10 @@ works just like a .gitignore.
    
 
  • README
    • 
 
  • CHANGES / CHANGELOG / HISTORY
    • 
 
  • LICENSE / LICENCE
    • 
+
  • NOTICE
    • 
 
  • The file in the "main" field
    • 
 

-
README, CHANGES & LICENSE can have any case and extension.

+
README, CHANGES, LICENSE & NOTICE can have any case and extension.

 
Conversely, some files are always ignored:

 
    
 
  • .git
    • 
@@ -579,5 +580,5 @@ ignored.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/index.html b/deps/npm/html/doc/index.html
index 7a3b07647e..5cfb9fae3e 100644
--- a/deps/npm/html/doc/index.html
+++ b/deps/npm/html/doc/index.html
@@ -162,5 +162,5 @@
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html
index a1c314795f..e1a5ec57ba 100644
--- a/deps/npm/html/doc/misc/npm-coding-style.html
+++ b/deps/npm/html/doc/misc/npm-coding-style.html
@@ -153,5 +153,5 @@ set to anything."
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html
index 81da576c69..0dce28b716 100644
--- a/deps/npm/html/doc/misc/npm-config.html
+++ b/deps/npm/html/doc/misc/npm-config.html
@@ -862,5 +862,5 @@ exit successfully.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html
index 07e7de3c0b..72fa5d16ef 100644
--- a/deps/npm/html/doc/misc/npm-developers.html
+++ b/deps/npm/html/doc/misc/npm-developers.html
@@ -194,5 +194,5 @@ from a fresh checkout.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html
index 6db1b489b6..fcb0b42b6a 100644
--- a/deps/npm/html/doc/misc/npm-disputes.html
+++ b/deps/npm/html/doc/misc/npm-disputes.html
@@ -13,7 +13,7 @@
 
    SYNOPSIS
    
 
      
 
    1. Get the author email with npm owner ls <pkgname>
      2. 
-
    2. Email the author, CC support@npmjs.com
      3. 
+
    3. Email the author, CC support@npmjs.com
      4. 
 
    4. After a few weeks, if there's no resolution, we'll sort it out.
      5. 
 
    
 
    Don't squat on package names.  Publish code or move out of the way.
    
@@ -51,12 +51,12 @@ Joe's appropriate course of action in each case is the same.
    
 owner (Bob).
 
  • Joe emails Bob, explaining the situation as respectfully as
 possible, and what he would like to do with the module name.  He
-adds the npm support staff support@npmjs.com to the CC list of
+adds the npm support staff support@npmjs.com to the CC list of
 the email.  Mention in the email that Bob can run npm owner add
 joe foo to add Joe as an owner of the foo package.
    • 
 
  • After a reasonable amount of time, if Bob has not responded, or if
 Bob and Joe can't come to any sort of resolution, email support
-support@npmjs.com and we'll sort it out.  ("Reasonable" is
+support@npmjs.com and we'll sort it out.  ("Reasonable" is
 usually at least 4 weeks, but extra time is allowed around common
 holidays.)
    • 
 
@@ -112,5 +112,5 @@ things into it.
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html
index 88bd599dba..80873484ec 100644
--- a/deps/npm/html/doc/misc/npm-index.html
+++ b/deps/npm/html/doc/misc/npm-index.html
@@ -162,4 +162,4 @@
   
    
 
-
+
diff --git a/deps/npm/html/doc/misc/npm-orgs.html b/deps/npm/html/doc/misc/npm-orgs.html
index d038adea8b..7dd6a9f50e 100644
--- a/deps/npm/html/doc/misc/npm-orgs.html
+++ b/deps/npm/html/doc/misc/npm-orgs.html
@@ -86,4 +86,4 @@
   
    
 
-
+
diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html
index 4de51caf8f..b29efa7b9e 100644
--- a/deps/npm/html/doc/misc/npm-registry.html
+++ b/deps/npm/html/doc/misc/npm-registry.html
@@ -70,5 +70,5 @@ effectively implement the entire CouchDB API anyway.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html
index 4e60189a90..bfe08b7b37 100644
--- a/deps/npm/html/doc/misc/npm-scope.html
+++ b/deps/npm/html/doc/misc/npm-scope.html
@@ -91,5 +91,5 @@ that registry instead.
    
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html
index eacb44166d..55381c5199 100644
--- a/deps/npm/html/doc/misc/npm-scripts.html
+++ b/deps/npm/html/doc/misc/npm-scripts.html
@@ -42,7 +42,7 @@ Run by the npm restart command. Note: npm restart will
 stop and start scripts if no restart script is provided.
 

 
Additionally, arbitrary scripts can be executed by running npm
-run-script <pkg> <stage>. Pre and post commands with matching
+run-script <stage>. Pre and post commands with matching
 names will be run for those as well (e.g. premyscript, myscript,
 postmyscript).

 
COMMON USES

@@ -208,5 +208,5 @@ scripts is for compilation which must be done on the target architecture.
   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html
index 66ea0812ec..939c95aca4 100644
--- a/deps/npm/html/doc/misc/removing-npm.html
+++ b/deps/npm/html/doc/misc/removing-npm.html
@@ -57,5 +57,5 @@ modules.  To track those down, you can do the following:

   
    
 
-
+
 
diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html
index 26e2ab5731..0f7dc970e9 100644
--- a/deps/npm/html/doc/misc/semver.html
+++ b/deps/npm/html/doc/misc/semver.html
@@ -302,5 +302,5 @@ range, use the satisfies(version, range) function.

   
    
 
-
+
 
diff --git a/deps/npm/lib/completion.js b/deps/npm/lib/completion.js
index ae611f918e..6f6cfd810b 100644
--- a/deps/npm/lib/completion.js
+++ b/deps/npm/lib/completion.js
@@ -153,7 +153,7 @@ function dumpScript (cb) {
 
     process.stdout.write(d, function () { cb() })
     process.stdout.on('error', function (er) {
-      // Darwin is a real dick sometimes.
+      // Darwin is a pain sometimes.
       //
       // This is necessary because the "source" or "." program in
       // bash on OS X closes its file argument before reading
diff --git a/deps/npm/lib/utils/tar.js b/deps/npm/lib/utils/tar.js
index f8ea10f511..98f6e4ff64 100644
--- a/deps/npm/lib/utils/tar.js
+++ b/deps/npm/lib/utils/tar.js
@@ -48,7 +48,7 @@ function pack (tarball, folder, pkg, cb) {
       var recalculateMetadata = require('../install/deps.js').recalculateMetadata
 
       readPackageTree(folder, iferr(cb, function (tree) {
-        recalculateMetadata(tree, log.newGroup('pack:' + pkg), iferr(cb, function () {
+        recalculateMetadata(tree, log.newGroup('pack:' + packageId(pkg)), iferr(cb, function () {
           pack_(tarball, folder, tree, flattenTree(tree), pkg, cb)
         }))
       }))
diff --git a/deps/npm/man/man1/npm-README.1 b/deps/npm/man/man1/npm-README.1
index 09c3805fed..199a6d0472 100644
--- a/deps/npm/man/man1/npm-README.1
+++ b/deps/npm/man/man1/npm-README.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "May 2016" "" ""
+.TH "NPM" "1" "June 2016" "" ""
 .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 7cc94f6210..6cddb81db0 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" "May 2016" "" ""
+.TH "NPM\-ACCESS" "1" "June 2016" "" ""
 .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 a2ede7903d..3a22940ba6 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" "May 2016" "" ""
+.TH "NPM\-ADDUSER" "1" "June 2016" "" ""
 .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 5b301a8fc6..c34af76a61 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" "May 2016" "" ""
+.TH "NPM\-BIN" "1" "June 2016" "" ""
 .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 f99cfcdb90..c348ba34d6 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" "May 2016" "" ""
+.TH "NPM\-BUGS" "1" "June 2016" "" ""
 .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 c1786a62c2..315daad2de 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" "May 2016" "" ""
+.TH "NPM\-BUILD" "1" "June 2016" "" ""
 .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 561d0f2859..098b0d3177 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" "May 2016" "" ""
+.TH "NPM\-BUNDLE" "1" "June 2016" "" ""
 .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 d9bfd8fd6a..b325ea3949 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" "May 2016" "" ""
+.TH "NPM\-CACHE" "1" "June 2016" "" ""
 .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 70c6a38e49..859abbc8cc 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" "May 2016" "" ""
+.TH "NPM\-COMPLETION" "1" "June 2016" "" ""
 .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 942d438ac0..bd4b143e87 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" "May 2016" "" ""
+.TH "NPM\-CONFIG" "1" "June 2016" "" ""
 .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 4575da0aa7..cfcea6b98a 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" "May 2016" "" ""
+.TH "NPM\-DEDUPE" "1" "June 2016" "" ""
 .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 e797531253..6a2844032e 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" "May 2016" "" ""
+.TH "NPM\-DEPRECATE" "1" "June 2016" "" ""
 .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 b7f026cdc9..7c8fe79e82 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" "May 2016" "" ""
+.TH "NPM\-DIST\-TAG" "1" "June 2016" "" ""
 .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 697e5cbd2d..0a887f2f9f 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" "May 2016" "" ""
+.TH "NPM\-DOCS" "1" "June 2016" "" ""
 .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 dfe6d8a147..754fec8d72 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" "May 2016" "" ""
+.TH "NPM\-EDIT" "1" "June 2016" "" ""
 .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 2b405f1777..fc88e338fb 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" "May 2016" "" ""
+.TH "NPM\-EXPLORE" "1" "June 2016" "" ""
 .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 45e2259803..1cf9884a24 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" "May 2016" "" ""
+.TH "NPM\-HELP\-SEARCH" "1" "June 2016" "" ""
 .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 7a118d43d8..0c100ceebd 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" "May 2016" "" ""
+.TH "NPM\-HELP" "1" "June 2016" "" ""
 .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 257ed41907..94955f5395 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" "May 2016" "" ""
+.TH "NPM\-INIT" "1" "June 2016" "" ""
 .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
index bc068c0dfa..c50a9ed3c3 100644
--- a/deps/npm/man/man1/npm-install-test.1
+++ b/deps/npm/man/man1/npm-install-test.1
@@ -1,4 +1,4 @@
-.TH "NPM" "" "May 2016" "" ""
+.TH "NPM" "" "June 2016" "" ""
 .SH "NAME"
 \fBnpm\fR
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index e97a2a5062..f416a314bb 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" "May 2016" "" ""
+.TH "NPM\-INSTALL" "1" "June 2016" "" ""
 .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 a61e297858..847f39dd53 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" "May 2016" "" ""
+.TH "NPM\-LINK" "1" "June 2016" "" ""
 .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 cfb281dddf..2cc4416a24 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" "May 2016" "" ""
+.TH "NPM\-LOGOUT" "1" "June 2016" "" ""
 .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 57199a488b..8dc00cbee9 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" "May 2016" "" ""
+.TH "NPM\-LS" "1" "June 2016" "" ""
 .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.9.3 /path/to/npm
+npm@3.9.5 /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 6dc171047e..85175129d4 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" "May 2016" "" ""
+.TH "NPM\-OUTDATED" "1" "June 2016" "" ""
 .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 646995433d..d5f259ab85 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" "May 2016" "" ""
+.TH "NPM\-OWNER" "1" "June 2016" "" ""
 .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 774cca2e84..494ceb0174 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" "May 2016" "" ""
+.TH "NPM\-PACK" "1" "June 2016" "" ""
 .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 cefc3f4bf5..2d0948ba1d 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" "May 2016" "" ""
+.TH "NPM\-PING" "1" "June 2016" "" ""
 .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 2a176a78ab..10b3c6ee9f 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" "May 2016" "" ""
+.TH "NPM\-PREFIX" "1" "June 2016" "" ""
 .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 2f0aea77c6..19da451f7d 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" "May 2016" "" ""
+.TH "NPM\-PRUNE" "1" "June 2016" "" ""
 .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 546b07cbe1..cf77289be6 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" "May 2016" "" ""
+.TH "NPM\-PUBLISH" "1" "June 2016" "" ""
 .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 cdc49dc9b3..44dd89da92 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" "May 2016" "" ""
+.TH "NPM\-REBUILD" "1" "June 2016" "" ""
 .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 af74675fee..6da71e6fd1 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" "May 2016" "" ""
+.TH "NPM\-REPO" "1" "June 2016" "" ""
 .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 80b573e346..10e662a15d 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" "May 2016" "" ""
+.TH "NPM\-RESTART" "1" "June 2016" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 1555041866..9b7d7ba614 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" "May 2016" "" ""
+.TH "NPM\-ROOT" "1" "June 2016" "" ""
 .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 7269378fd9..f2f6e5a074 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" "May 2016" "" ""
+.TH "NPM\-RUN\-SCRIPT" "1" "June 2016" "" ""
 .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 3ffb15c3be..62247cc3f3 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" "May 2016" "" ""
+.TH "NPM\-SEARCH" "1" "June 2016" "" ""
 .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 88607cf5ff..f00ca28e82 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" "May 2016" "" ""
+.TH "NPM\-SHRINKWRAP" "1" "June 2016" "" ""
 .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 72a6af7655..be6dc68d1f 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" "May 2016" "" ""
+.TH "NPM\-STAR" "1" "June 2016" "" ""
 .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 ad264611ef..faef97d2df 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" "May 2016" "" ""
+.TH "NPM\-STARS" "1" "June 2016" "" ""
 .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 33143e4168..cb09bea2c7 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" "May 2016" "" ""
+.TH "NPM\-START" "1" "June 2016" "" ""
 .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 8f1e4be700..9fa9e8f018 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" "May 2016" "" ""
+.TH "NPM\-STOP" "1" "June 2016" "" ""
 .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 ecc67ca2dc..7c4564d5e5 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" "May 2016" "" ""
+.TH "NPM\-TAG" "1" "June 2016" "" ""
 .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 d77435ba7e..0ec2aaf28a 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" "May 2016" "" ""
+.TH "NPM\-TEAM" "1" "June 2016" "" ""
 .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 30f1b8ea96..18407f3fde 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" "May 2016" "" ""
+.TH "NPM\-TEST" "1" "June 2016" "" ""
 .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 d607270a16..c248eaef5d 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -1,4 +1,4 @@
-.TH "NPM\-UNINSTALL" "1" "May 2016" "" ""
+.TH "NPM\-UNINSTALL" "1" "June 2016" "" ""
 .SH "NAME"
 \fBnpm-uninstall\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 b939ad45e7..1d1a47774c 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" "May 2016" "" ""
+.TH "NPM\-UNPUBLISH" "1" "June 2016" "" ""
 .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 9a40a170f5..3c2ff59eb5 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" "May 2016" "" ""
+.TH "NPM\-UPDATE" "1" "June 2016" "" ""
 .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 4b0ea7f9aa..2ddcabd61b 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" "May 2016" "" ""
+.TH "NPM\-VERSION" "1" "June 2016" "" ""
 .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 5640777b58..a1261bd548 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" "May 2016" "" ""
+.TH "NPM\-VIEW" "1" "June 2016" "" ""
 .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 958b4cfd70..2fe942f8ed 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" "May 2016" "" ""
+.TH "NPM\-WHOAMI" "1" "June 2016" "" ""
 .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 661f4586d7..cc2a401e45 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -1,4 +1,4 @@
-.TH "NPM" "1" "May 2016" "" ""
+.TH "NPM" "1" "June 2016" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SH SYNOPSIS
@@ -10,7 +10,7 @@ npm  [args]
 .RE
 .SH VERSION
 .P
-3.9.3
+3.9.5
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
@@ -41,7 +41,7 @@ requires compiling of C++ Code, npm will use
 node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR for that task\.
 For a Unix system, node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR
 needs Python, make and a buildchain like GCC\. On Windows,
-Python and Microsoft Visual Studio C++ is needed\. Python 3 is
+Python and Microsoft Visual Studio C++ are needed\. Python 3 is
 not supported by node\-gyp \fIhttps://github\.com/TooTallNate/node\-gyp\fR\|\.
 For more information visit
 the node\-gyp repository \fIhttps://github\.com/TooTallNate/node\-gyp\fR and
diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5
index cf364ce0b2..e5d5002cf2 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" "May 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "June 2016" "" ""
 .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 cf364ce0b2..e5d5002cf2 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" "May 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "June 2016" "" ""
 .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 1829c36105..9afbea0c3d 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" "May 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "June 2016" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -227,11 +227,13 @@ Certain files are always included, regardless of settings:
 .IP \(bu 2
 \fBLICENSE\fP / \fBLICENCE\fP
 .IP \(bu 2
+\fBNOTICE\fP
+.IP \(bu 2
 The file in the "main" field
 
 .RE
 .P
-\fBREADME\fP, \fBCHANGES\fP & \fBLICENSE\fP can have any case and extension\.
+\fBREADME\fP, \fBCHANGES\fP, \fBLICENSE\fP & \fBNOTICE\fP can have any case and extension\.
 .P
 Conversely, some files are always ignored:
 .RS 0
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index 8b5d2b2e34..f70ee7da74 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "May 2016" "" ""
+.TH "NPMRC" "5" "June 2016" "" ""
 .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 1829c36105..9afbea0c3d 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" "May 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "June 2016" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -227,11 +227,13 @@ Certain files are always included, regardless of settings:
 .IP \(bu 2
 \fBLICENSE\fP / \fBLICENCE\fP
 .IP \(bu 2
+\fBNOTICE\fP
+.IP \(bu 2
 The file in the "main" field
 
 .RE
 .P
-\fBREADME\fP, \fBCHANGES\fP & \fBLICENSE\fP can have any case and extension\.
+\fBREADME\fP, \fBCHANGES\fP, \fBLICENSE\fP & \fBNOTICE\fP can have any case and extension\.
 .P
 Conversely, some files are always ignored:
 .RS 0
diff --git a/deps/npm/man/man7/npm-coding-style.7 b/deps/npm/man/man7/npm-coding-style.7
index 5ddd7b7124..7fd20b5297 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" "May 2016" "" ""
+.TH "NPM\-CODING\-STYLE" "7" "June 2016" "" ""
 .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 f1a8bedc2b..6153cd4e16 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" "May 2016" "" ""
+.TH "NPM\-CONFIG" "7" "June 2016" "" ""
 .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 0aa9bb53c6..de6895f69a 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" "May 2016" "" ""
+.TH "NPM\-DEVELOPERS" "7" "June 2016" "" ""
 .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 db434aa6f9..4f6c315be0 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" "May 2016" "" ""
+.TH "NPM\-DISPUTES" "7" "June 2016" "" ""
 .SH "NAME"
 \fBnpm-disputes\fR \- Handling Module Name Disputes
 .SH SYNOPSIS
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 54965f9fcd..778666b951 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" "May 2016" "" ""
+.TH "NPM\-INDEX" "7" "June 2016" "" ""
 .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 0eb054f4d0..2961014fb8 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" "May 2016" "" ""
+.TH "NPM\-ORGS" "7" "June 2016" "" ""
 .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 1d07da46ac..743710179f 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" "May 2016" "" ""
+.TH "NPM\-REGISTRY" "7" "June 2016" "" ""
 .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 7b0e02ea20..0adc8bd29b 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" "May 2016" "" ""
+.TH "NPM\-SCOPE" "7" "June 2016" "" ""
 .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 72d4ae06d3..4e382cd98b 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" "May 2016" "" ""
+.TH "NPM\-SCRIPTS" "7" "June 2016" "" ""
 .SH "NAME"
 \fBnpm-scripts\fR \- How npm handles the "scripts" field
 .SH DESCRIPTION
@@ -48,7 +48,7 @@ stop and start scripts if no \fBrestart\fP script is provided\.
 .RE
 .P
 Additionally, arbitrary scripts can be executed by running \fBnpm
-run\-script  \fP\|\. \fIPre\fR and \fIpost\fR commands with matching
+run\-script \fP\|\. \fIPre\fR and \fIpost\fR commands with matching
 names will be run for those as well (e\.g\. \fBpremyscript\fP, \fBmyscript\fP,
 \fBpostmyscript\fP)\.
 .SH COMMON USES
diff --git a/deps/npm/man/man7/removing-npm.7 b/deps/npm/man/man7/removing-npm.7
index cbd6ae2346..0df248fbc0 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" "May 2016" "" ""
+.TH "NPM\-REMOVAL" "1" "June 2016" "" ""
 .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 84b72ecc74..8705628aca 100644
--- a/deps/npm/man/man7/semver.7
+++ b/deps/npm/man/man7/semver.7
@@ -1,4 +1,4 @@
-.TH "SEMVER" "7" "May 2016" "" ""
+.TH "SEMVER" "7" "June 2016" "" ""
 .SH "NAME"
 \fBsemver\fR \- The semantic versioner for npm
 .SH Usage
diff --git a/deps/npm/node_modules/aproba/README.md b/deps/npm/node_modules/aproba/README.md
index e5c1f5595b..44e2263c2f 100644
--- a/deps/npm/node_modules/aproba/README.md
+++ b/deps/npm/node_modules/aproba/README.md
@@ -23,7 +23,7 @@ Valid types are:
 type | description
 ---- | -----------
 *    | matches any type
-A    | instanceof Array OR an arguments object
+A    | Array.isArray OR an arguments object
 S    | typeof == string
 N    | typeof == number
 F    | typeof == function
diff --git a/deps/npm/node_modules/aproba/index.js b/deps/npm/node_modules/aproba/index.js
index 7d8ff07f87..6d1c17ece9 100644
--- a/deps/npm/node_modules/aproba/index.js
+++ b/deps/npm/node_modules/aproba/index.js
@@ -1,51 +1,56 @@
-"use strict"
+'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 }]
+  '*': ['any', function () { return true }],
+  A: ['array', function (thingy) { return (Array.isArray && Array.isArray(thingy)) || (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)
+  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 (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 (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 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 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 invalidType (num, expectedType, value) {
+  var valueType
+  Object.keys(types).forEach(function (typeCode) {
+    if (types[typeCode][1](value)) valueType = types[typeCode][0]
+  })
+  return newException('EINVALIDTYPE', 'Argument #' + (num + 1) + ': Expected ' +
+    expectedType + ' but got ' + valueType)
 }
 
-function tooManyArgs(expected, got) {
-  return newException("ETOOMANYARGS", "Too many arguments, expected "+expected+" and got "+got)
+function tooManyArgs (expected, got) {
+  return newException('ETOOMANYARGS', 'Too many arguments, expected ' + expected + ' and got ' + got)
 }
 
-function newException(code, msg) {
+function newException (code, msg) {
   var e = new Error(msg)
   e.code = code
   Error.captureStackTrace(e, validate)
diff --git a/deps/npm/node_modules/aproba/package.json b/deps/npm/node_modules/aproba/package.json
index b41acdf973..56452c4067 100644
--- a/deps/npm/node_modules/aproba/package.json
+++ b/deps/npm/node_modules/aproba/package.json
@@ -1,54 +1,92 @@
 {
-  "name": "aproba",
-  "version": "1.0.1",
-  "description": "A rediculously light-weight argument validator",
-  "main": "index.js",
-  "directories": {
-    "test": "test"
+  "_args": [
+    [
+      {
+        "name": "aproba",
+        "raw": "aproba@latest",
+        "rawSpec": "latest",
+        "scope": null,
+        "spec": "latest",
+        "type": "tag"
+      },
+      "/Users/zkat/Documents/code/npm"
+    ]
+  ],
+  "_from": "aproba@latest",
+  "_id": "aproba@1.0.3",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/aproba",
+  "_nodeVersion": "4.4.0",
+  "_npmOperationalInternal": {
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/aproba-1.0.3.tgz_1463784729571_0.7574592484161258"
+  },
+  "_npmUser": {
+    "email": "me@re-becca.org",
+    "name": "iarna"
+  },
+  "_npmVersion": "3.9.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "aproba",
+    "raw": "aproba@latest",
+    "rawSpec": "latest",
+    "scope": null,
+    "spec": "latest",
+    "type": "tag"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.3.tgz",
+  "_shasum": "7fb6da3a72c70249db63fd9b5c64b31af718a94f",
+  "_shrinkwrap": null,
+  "_spec": "aproba@latest",
+  "_where": "/Users/zkat/Documents/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"
+    "standard": "^7.1.0",
+    "tap": "^5.7.1"
   },
-  "scripts": {
-    "test": "tap test/*.js"
+  "directories": {
+    "test": "test"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iarna/aproba"
+  "dist": {
+    "shasum": "7fb6da3a72c70249db63fd9b5c64b31af718a94f",
+    "tarball": "https://registry.npmjs.org/aproba/-/aproba-1.0.3.tgz"
   },
+  "gitHead": "20cc4fc6589bbf870c3ca7bb8b9cb203af9d96a5",
+  "homepage": "https://github.com/iarna/aproba",
   "keywords": [
     "argument",
     "validate"
   ],
-  "author": {
-    "name": "Rebecca Turner",
-    "email": "me@re-becca.org"
-  },
   "license": "ISC",
-  "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"
-  },
+  "main": "index.js",
   "maintainers": [
     {
-      "name": "iarna",
-      "email": "me@re-becca.org"
+      "email": "me@re-becca.org",
+      "name": "iarna"
     }
   ],
-  "dist": {
-    "shasum": "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef",
-    "tarball": "http://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
+  "name": "aproba",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/iarna/aproba.git"
+  },
+  "scripts": {
+    "test": "standard && tap test/*.js"
   },
-  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz"
+  "version": "1.0.3"
 }
diff --git a/deps/npm/node_modules/aproba/test/index.js b/deps/npm/node_modules/aproba/test/index.js
index 0574709c8f..b96fd4216e 100644
--- a/deps/npm/node_modules/aproba/test/index.js
+++ b/deps/npm/node_modules/aproba/test/index.js
@@ -1,85 +1,87 @@
-"use strict"
-var test = require("tap").test
-var validate = require("../index.js")
+'use strict'
+var test = require('tap').test
+var validate = require('../index.js')
 
 function thrown (t, code, msg, todo) {
-  validate("OSSF", arguments)
+  validate('OSSF', arguments)
   try {
     todo()
     t.fail(msg)
-  }
-  catch (e) {
+  } catch (e) {
     t.is(e.code, code, msg + e.message)
   }
 }
 
 function notThrown (t, msg, todo) {
-  validate("OSF", arguments)
+  validate('OSF', arguments)
   try {
     todo()
     t.pass(msg)
-  }
-  catch (e) {
-    t.fail(msg+"\n"+e.stack)
+  } catch (e) {
+    t.fail(msg + '\n' + e.stack)
   }
 }
 
-test("general", function (t) {
-  t.plan(69)
+test('general', function (t) {
+  t.plan(70)
   var values = {
-    "A": [],
-    "S": "test",
-    "N": 123,
-    "F": function () {},
-    "O": {},
-    "B": false,
-    "E": new Error()
+    '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 () {
+        notThrown(t, type + ' matches ' + contraType, function () {
           validate(type, [values[contraType]])
         })
-      }
-      else {
-        thrown(t, "EINVALIDTYPE", type + " does not match " + contraType, function () {
+      } 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 () {
+    if (type === 'E') {
+      notThrown(t, 'null is ok for E', function () {
         validate(type, [null])
       })
-    }
-    else {
-      thrown(t, "EMISSINGARG", "null not ok for "+type, function () {
+    } 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]])
+    notThrown(t, '* matches ' + contraType, function () {
+      validate('*', [values[contraType]])
     })
   })
-  thrown(t, "EMISSINGARG", "not enough args", function () {
-    validate("SNF", ["abc", 123])
+  thrown(t, 'EMISSINGARG', 'not enough args', function () {
+    validate('SNF', ['abc', 123])
   })
-  thrown(t, "ETOOMANYARGS", "too many args", function () {
-    validate("SNF", ["abc", 123, function () {}, true])
+  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 null', function () {
+    validate('E', [null])
   })
-  notThrown(t, "E matches undefined", function () {
-    validate("E", [undefined])
+  notThrown(t, 'E matches undefined', function () {
+    validate('E', [undefined])
   })
-  notThrown(t, "E w/ error requires nothing else", function () {
-    validate("ESN", [new Error(), "foo"])
+  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"])
+  thrown(t, 'EMISSINGARG', 'E w/o error works as usual', function () {
+    validate('ESN', [null, 'foo'])
   })
+  try {
+    validate('O', [[]])
+    t.fail('object != array')
+  } catch (ex) {
+    t.match(ex.message, /Expected object but got array/, 'When reporting non-objects, uses aproba types')
+  }
 })
diff --git a/deps/npm/package.json b/deps/npm/package.json
index 1623994091..2001ea150c 100644
--- a/deps/npm/package.json
+++ b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.9.3",
+  "version": "3.9.5",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -33,7 +33,7 @@
     "abbrev": "~1.0.7",
     "ansicolors": "~0.3.2",
     "ansistyles": "~0.1.3",
-    "aproba": "~1.0.1",
+    "aproba": "~1.0.3",
     "archy": "~1.0.0",
     "chownr": "~1.0.1",
     "cmd-shim": "~2.0.2",
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 62ad80be11..0000000000
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ /dev/null
@@ -1,22 +0,0 @@
-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="
-
-[_token]
-AuthSession=yabba-dabba-doodle
-version=1
-expires=1345001053415
-path=/
-httponly=true
diff --git a/deps/npm/test/tap/outdated-symlink.js b/deps/npm/test/tap/outdated-symlink.js
index a5ebea0d2e..809cfec2e2 100644
--- a/deps/npm/test/tap/outdated-symlink.js
+++ b/deps/npm/test/tap/outdated-symlink.js
@@ -10,13 +10,13 @@ var common = require('../common-tap.js')
 
 var pkg = path.resolve(__dirname, 'outdated-symlink')
 var cache = path.resolve(pkg, 'cache')
-var originalLog
+var extend = Object.assign || require('util')._extend
 
-var fakeRoot = path.join(__dirname, 'fakeRoot')
+var fakeRoot = path.join(pkg, 'fakeRoot')
 var OPTS = {
-  env: {
+  env: extend(extend({}, process.env), {
     'npm_config_prefix': fakeRoot
-  }
+  })
 }
 
 var json = {
@@ -27,22 +27,26 @@ var json = {
 
 test('setup', function (t) {
   cleanup()
-  originalLog = console.log
   mkdirp.sync(cache)
   fs.writeFileSync(
     path.join(pkg, 'package.json'),
     JSON.stringify(json, null, 2)
   )
   process.chdir(pkg)
-  common.npm(['install', '-g', 'async@0.2.9', 'underscore@1.3.1'], OPTS, function (err, c, out) {
-    t.ifError(err, 'global install did not error')
-    common.npm(['link'], OPTS, function (err, c, out) {
-      t.ifError(err, 'link did not 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, /my-local-package@1.0.0/, 'creates global link ok')
+  common.npm(['install', '-g', 'async@0.2.9', 'underscore@1.3.1'], OPTS, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.comment(stdout)
+    t.comment(stderr)
+    common.npm(['link'], OPTS, function (err, code, stdout, stderr) {
+      if (err) throw err
+      t.comment(stdout)
+      t.comment(stderr)
+      t.is(code, 0)
+      common.npm(['ls', '-g'], OPTS, function (err, code, stdout, stderr) {
+        if (err) throw err
+        t.is(code, 0)
+        t.is(stderr, '', 'got expected stderr')
+        t.match(stdout, /my-local-package@1.0.0/, 'creates global link ok')
         t.end()
       })
     })
@@ -54,7 +58,6 @@ test('when outdated is called linked packages should be displayed as such', func
   var regOutInstallOne = /async\s*0.2.9\s*0.2.9\s*0.2.10\n/
   var regOutInstallTwo = /underscore\s*1.3.1\s*1.3.1\s*1.5.1\n/
 
-  console.log = function () {}
   mr({ port: common.port }, function (er, s) {
     common.npm(
       [
@@ -63,10 +66,11 @@ test('when outdated is called linked packages should be displayed as such', func
       ],
       OPTS,
       function (err, c, out, stderr) {
-        t.ifError(err)
-        t.ok(out.match(regOutLinked), 'Global Link format as expected')
-        t.ok(out.match(regOutInstallOne), 'Global Install format as expected')
-        t.ok(out.match(regOutInstallTwo), 'Global Install format as expected')
+        if (err) throw err
+        t.is(stderr, '')
+        t.match(out, regOutLinked, 'Global Link format as expected')
+        t.match(out, regOutInstallOne, 'Global Install format as expected')
+        t.match(out, regOutInstallTwo, 'Global Install format as expected')
         s.close()
         t.end()
       }
@@ -76,14 +80,17 @@ test('when outdated is called linked packages should be displayed as such', func
 
 test('cleanup', function (t) {
   process.chdir(osenv.tmpdir())
-  common.npm(['rm', 'outdated'], OPTS, function (err, code) {
-    t.ifError(err, 'npm removed the linked package without error')
-    t.equal(code, 0, 'cleanup outdated in local ok')
+  common.npm(['rm', 'outdated'], OPTS, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.comment(stdout)
+    t.comment(stderr)
+    t.is(code, 0, 'cleanup outdated in local ok')
     common.npm(['rm', '-g', 'outdated', 'async', 'underscore'], OPTS, function (err, code) {
-      t.ifError(err, 'npm removed the global package without error')
-      t.equal(code, 0, 'cleanup outdated in global ok')
+      if (err) throw err
+      t.comment(stdout)
+      t.comment(stderr)
+      t.is(code, 0, 'cleanup outdated in global ok')
 
-      console.log = originalLog
       cleanup()
       t.end()
     })
diff --git a/deps/npm/test/tap/rm-linked.js b/deps/npm/test/tap/rm-linked.js
index cd46c013ad..381d7bc67a 100644
--- a/deps/npm/test/tap/rm-linked.js
+++ b/deps/npm/test/tap/rm-linked.js
@@ -65,23 +65,30 @@ var installJSON = {
 
 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")
+  common.npm(['ls', '-g', '--depth=0'], OPTS, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.comment(stdout)
+    t.comment(stderr)
+    t.is(code, 0, 'ls -g')
+    t.notMatch(stdout, /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)
+  common.npm(['link'], OPTS, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.is(code, 0, 'link')
+    t.comment(stdout)
+    t.comment(stderr)
+    common.npm(['ls', '-g'], OPTS, function (err, code, stdout, stderr) {
+      if (err) throw err
+      t.comment(stdout)
+      t.comment(stderr)
+      t.is(code, 0, 'ls -g')
       t.equal(stderr, '', 'got expected stderr')
-      t.has(out, /foo@1.0.0/, 'creates global link ok')
+      t.match(stdout, /foo@1.0.0/, 'creates global link ok')
       t.end()
     })
   })
@@ -89,13 +96,18 @@ test('creates global link', function (t) {
 
 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')
+  common.npm(['uninstall', '-g', 'foo'], OPTS, function (err, code, stdout, stderr) {
+    if (err) throw err
+    t.is(code, 0, 'uninstall -g foo')
+    t.comment(stdout)
+    t.comment(stderr)
     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")
+    common.npm(['ls'], OPTS, function (err, code, stdout) {
+      if (err) throw err
+      t.is(code, 0, 'ls')
+      t.comment(stdout)
+      t.comment(stderr)
+      t.match(stdout, /baz@1.0.0/, "uninstall didn't remove dep")
       t.end()
     })
   })
diff --git a/deps/npm/test/tap/shrinkwrap-dev-dependency.js b/deps/npm/test/tap/shrinkwrap-dev-dependency.js
index 0a239e97ce..3328134629 100644
--- a/deps/npm/test/tap/shrinkwrap-dev-dependency.js
+++ b/deps/npm/test/tap/shrinkwrap-dev-dependency.js
@@ -8,36 +8,13 @@ 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-dev-dependency')
 
-test("shrinkwrap doesn't strip out the dependency", 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.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 opts = [
+  '--cache', path.resolve(pkg, 'cache'),
+  '--registry', common.registry
+]
 
 var desired = {
   name: 'npm-test-shrinkwrap-dev-dependency',
@@ -69,20 +46,48 @@ var json = {
   }
 }
 
-function setup (cb) {
+function setup () {
   cleanup()
   mkdirp.sync(pkg)
   fs.writeFileSync(path.join(pkg, 'package.json'), JSON.stringify(json, null, 2))
   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)
 }
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+test("shrinkwrap doesn't strip out the dependency", function (t) {
+  t.plan(3)
+  setup()
+
+  mr({port: common.port}, function (er, s) {
+    common.npm(opts.concat(['install', '.']), {stdio: [0, 'pipe', 2]}, function (err, code) {
+      if (err) throw err
+      if (!t.is(code, 0)) return (s.close(), t.end())
+      common.npm(opts.concat(['shrinkwrap']), {stdio: [0, 2, 2]}, function (err, code) {
+        if (err) throw err
+        t.is(code, 0)
+        try {
+          var results = JSON.parse(fs.readFileSync(path.join(pkg, 'npm-shrinkwrap.json')))
+        } catch (ex) {
+          t.comment(ex)
+        }
+        t.deepEqual(results, desired)
+        s.close()
+        t.end()
+      })
+    })
+  })
+})
+
+test('cleanup', function (t) {
+  cleanup()
+  t.end()
+})
diff --git a/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
index 5bcae6d2f5..723960ac32 100644
--- a/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
+++ b/deps/npm/test/tap/shrinkwrap-prod-dependency-also.js
@@ -7,35 +7,55 @@ 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')
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
+var opts = [
+  '--cache=' + path.resolve(pkg, 'cache'),
+  '--registry=' + common.registry
+]
+
+function reportOutput (t, fh, out) {
+  var trimmed = out.trim()
+  if (!trimmed.length) return
+  var prefix = fh + '> '
+  t.comment(prefix + trimmed.split(/\n/).join('\n' + prefix))
+}
 
+var server
 test("shrinkwrap --also=development doesn't strip out prod dependencies", function (t) {
-  t.plan(1)
+  t.plan(4)
 
   mr({port: common.port}, function (er, s) {
-    setup({}, function (err) {
+    server = s
+    setup()
+    common.npm(['install', '.'].concat(opts), {cwd: pkg}, function (err, code, stdout, stderr) {
       if (err) return t.fail(err)
-
-      npm.install('.', function (err) {
+      t.is(code, 0, 'install')
+      reportOutput(t, 'out', stdout)
+      reportOutput(t, 'err', stderr)
+      common.npm(['shrinkwrap', '--also=development'].concat(opts), {cwd: pkg}, function (err, code, stdout, stderr) {
         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()
-        })
+        var ok = t.is(code, 0, 'shrinkwrap')
+        reportOutput(t, 'out', stdout)
+        reportOutput(t, 'err', stderr)
+        if (ok) {
+          try {
+            var results = JSON.parse(fs.readFileSync(path.join(pkg, 'npm-shrinkwrap.json')))
+            t.pass('read shrinkwrap')
+          } catch (ex) {
+            t.ifError(ex, 'read shrinkwrap')
+          }
+        }
+        t.deepEqual(results, desired, 'results have dev dep')
+        s.done()
+        t.end()
       })
     })
   })
 })
 
 test('cleanup', function (t) {
+  server.close()
   cleanup()
   t.end()
 })
@@ -69,22 +89,10 @@ var json = {
   }
 }
 
-function setup (opts, cb) {
+function setup (opts) {
   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 () {
diff --git a/deps/npm/test/tap/shrinkwrap-scoped-auth.js b/deps/npm/test/tap/shrinkwrap-scoped-auth.js
index 63fd08cb07..a469bc8356 100644
--- a/deps/npm/test/tap/shrinkwrap-scoped-auth.js
+++ b/deps/npm/test/tap/shrinkwrap-scoped-auth.js
@@ -19,8 +19,6 @@ var tarball = resolve(__dirname, '../fixtures/scoped-underscore-1.3.1.tgz')
 
 var server
 
-var EXEC_OPTS = { cwd: pkg }
-
 function mocks (server) {
   var auth = 'Bearer 0xabad1dea'
   server.get(tarballPath, { authorization: auth }).replyWithFile(200, tarball)
@@ -43,16 +41,16 @@ test('authed npm install with shrinkwrapped scoped package', function (t) {
   common.npm(
     [
       'install',
-      '--loglevel', 'silent',
+      '--loglevel', 'warn',
       '--json',
       '--fetch-retries', 0,
       '--userconfig', outfile
     ],
-    EXEC_OPTS,
+    {cwd: pkg},
     function (err, code, stdout, stderr) {
-      t.ifError(err, 'test runner executed without error')
+      if (err) throw err
+      if (stderr) t.comment(stderr)
       t.equal(code, 0, 'npm install exited OK')
-      t.notOk(stderr, 'no output on stderr')
       try {
         var results = JSON.parse(stdout)
       } catch (ex) {