deps upgrade npm to 2.5.1

Makefile

@@ -151,15 +151,17 @@ test-debugger: all
 test-npm: node
 	rm -rf npm-cache npm-tmp npm-prefix
 	mkdir npm-cache npm-tmp npm-prefix
-	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
+	cd deps/npm ; export PATH="$(shell pwd):/bin:/usr/bin" ; \
+	     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 ; npm_config_cache="$(shell pwd)/npm-cache" \
+	     node cli.js install
+	cd deps/npm ; export PATH="$(shell pwd):/bin:/usr/bin" ; \
+	     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
 

deps/npm/.mailmap

@@ -0,0 +1,31 @@
+Arlo Breault <[email protected]>
+Alex K. Wolfe <[email protected]>
+Andrew Lunny <[email protected]>
+Benjamin Coe <[email protected]>
+Brian White <[email protected]> <[email protected]>
+Charlie Robbins <[email protected]>
+Dalmais Maxence <[email protected]>
+David Beitey <[email protected]>
+Domenic Denicola <[email protected]>
+Einar Otto Stangvik <[email protected]>
+Evan Lucas <[email protected]> <[email protected]> <[email protected]>
+Faiq Raza <[email protected]>
+Forbes Lindesay <[email protected]>
+Forrest L. Norvell <[email protected]> <[email protected]>
+Gabriel Barros <[email protected]>
+Geoff Flarity <[email protected]> <gflarity@raptvm-x02.(none)>
+Isaac Z. Schlueter <[email protected]> <[email protected]>
+Jake Verbaten <[email protected]>
+James Sanders <[email protected]>
+Jason Smith <[email protected]>
+Kris Windham <[email protected]>
+Lin Clark <[email protected]>
+Maciej Małecki <[email protected]> <[email protected]>
+Maximilian Antoni <[email protected]> <[email protected]>
+Maxim Bogushevich <[email protected]>
+Max Goodman <[email protected]>
+Nicolas Morel <[email protected]>
+Olivier Melcher <[email protected]>
+Visnu Pitiyanuvath <[email protected]>
+Will Elwood <[email protected]>
+Zeke Sikelianos <[email protected]>