Upgrade npm to 2.5.1

[misterdjules]

@othiym23 When applying the patch from #9151, I had a lot of rejected files. To move things forward, I upgraded to 2.5.1 manually and made sure all the tests pass. The diff between the two PRs is just the change to the Makefile:

➜  v0.12 git:(upgrade-npm-to-2-5-1) git diff npm/npm-2.5.1 origin/upgrade-npm-to-2-5-1 
diff --git a/Makefile b/Makefile
index b3087f8..6c148eb 100644
--- a/Makefile
+++ b/Makefile
@@ -151,17 +151,15 @@ test-debugger: all
 test-npm: node
        rm -rf npm-cache npm-tmp npm-prefix
        mkdir npm-cache npm-tmp npm-prefix
-       cd deps/npm ; export PATH="$(shell pwd):/bin:/usr/bin" ; \
-            npm_config_cache="$(shell pwd)/npm-cache" \
+       cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
             npm_config_prefix="$(shell pwd)/npm-prefix" \
             npm_config_tmp="$(shell pwd)/npm-tmp" \
-            node cli.js install
-       cd deps/npm ; export PATH="$(shell pwd):/bin:/usr/bin" ; \
-            npm_config_cache="$(shell pwd)/npm-cache" \
+            ../../node cli.js install
+       cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
             npm_config_prefix="$(shell pwd)/npm-prefix" \
             npm_config_tmp="$(shell pwd)/npm-tmp" \
-            node cli.js run-script test-all && \
-            node cli.js prune --prod && \
+            ../../node cli.js run-script test-all && \
+            ../../node cli.js prune --prod && \
             cd ../.. && \
             rm -rf npm-cache npm-tmp npm-prefix

➜  v0.12 git:(upgrade-npm-to-2-5-1) 

Thank you again for all your help and support @othiym23, this is very much appreciated.

[tjfontaine]

Lgtm

[othiym23]

Just be aware that without that patch, make test-npm will not work correctly.

[misterdjules]

@tjfontaine @othiym23 Sorry, I wasn't passing --ignore-whitespace to git am, which is why applying #9151 was failing with rejected patches. My apologies for the confusion.

So I'll apply the commit that upgrades npm to 2.5.1 from #9151, and leave out the change to the Makefile for now because I'd rather take the time to review it carefully, which I can't do properly now.