Upgrade npm to 1.1.21

Somehow this got downgraded in the last v0.6 merge.  Very strange.

3 files changed, 11 insertions, 20 deletions

diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js
index e0b9f20bb8..f29437093e 100755
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@@ -49,6 +49,13 @@ if (conf.version) {
   return
 }
 
+if (conf.versions) {
+  var v = process.versions
+  v.npm = npm.version
+  console.log(v)
+  return
+}
+
 log.info("npm@"+npm.version, "using")
 log.info("node@"+process.version, "using")
 
diff --git a/deps/npm/bin/npm-get-uid-gid.js b/deps/npm/bin/npm-get-uid-gid.js
deleted file mode 100755
index 390e0f2fc9..0000000000
--- a/deps/npm/bin/npm-get-uid-gid.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var argv = process.argv.slice(2)
-  , user = argv[0] || process.getuid()
-  , group = argv[1] || process.getgid()
-
-if (!isNaN(user)) user = +user
-if (!isNaN(group)) group = +group
-
-console.error([user, group])
-
-try {
-  process.setgid(group)
-  process.setuid(user)
-  console.log(JSON.stringify({uid:+process.getuid(), gid:+process.getgid()}))
-} catch (ex) {
-  console.log(JSON.stringify({error:ex.message,errno:ex.errno}))
-}
diff --git a/deps/npm/bin/npm.cmd b/deps/npm/bin/npm.cmd
index bac9e5f1c4..7720e20529 100644
--- a/deps/npm/bin/npm.cmd
+++ b/deps/npm/bin/npm.cmd
@@ -1,6 +1,6 @@
 :: Created by npm, please don't edit manually.

-@IF EXIST "%~dp0"\"node.exe" (

-  "%~dp0"\"node.exe"  "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*

+@IF EXIST "%~dp0\node.exe" (

+  "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*

 ) ELSE (

-  node  "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*

-)
\ No newline at end of file
+  node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*

+)