diff --git a/node_modules/glob/test/00-setup.js b/node_modules/glob/test/00-setup.js
deleted file mode 100644
index 245afafda4..0000000000
--- a/node_modules/glob/test/00-setup.js
+++ /dev/null
@@ -1,176 +0,0 @@
-// just a little pre-run script to set up the fixtures.
-// zz-finish cleans it up
-
-var mkdirp = require("mkdirp")
-var path = require("path")
-var i = 0
-var tap = require("tap")
-var fs = require("fs")
-var rimraf = require("rimraf")
-
-var files =
-[ "a/.abcdef/x/y/z/a"
-, "a/abcdef/g/h"
-, "a/abcfed/g/h"
-, "a/b/c/d"
-, "a/bc/e/f"
-, "a/c/d/c/b"
-, "a/cb/e/f"
-]
-
-var symlinkTo = path.resolve(__dirname, "a/symlink/a/b/c")
-var symlinkFrom = "../.."
-
-files = files.map(function (f) {
-  return path.resolve(__dirname, f)
-})
-
-tap.test("remove fixtures", function (t) {
-  rimraf(path.resolve(__dirname, "a"), function (er) {
-    t.ifError(er, "remove fixtures")
-    t.end()
-  })
-})
-
-files.forEach(function (f) {
-  tap.test(f, function (t) {
-    var d = path.dirname(f)
-    mkdirp(d, 0755, function (er) {
-      if (er) {
-        t.fail(er)
-        return t.bailout()
-      }
-      fs.writeFile(f, "i like tests", function (er) {
-        t.ifError(er, "make file")
-        t.end()
-      })
-    })
-  })
-})
-
-if (process.platform !== "win32") {
-  tap.test("symlinky", function (t) {
-    var d = path.dirname(symlinkTo)
-    console.error("mkdirp", d)
-    mkdirp(d, 0755, function (er) {
-      t.ifError(er)
-      fs.symlink(symlinkFrom, symlinkTo, "dir", function (er) {
-        t.ifError(er, "make symlink")
-        t.end()
-      })
-    })
-  })
-}
-
-;["foo","bar","baz","asdf","quux","qwer","rewq"].forEach(function (w) {
-  w = "/tmp/glob-test/" + w
-  tap.test("create " + w, function (t) {
-    mkdirp(w, function (er) {
-      if (er)
-        throw er
-      t.pass(w)
-      t.end()
-    })
-  })
-})
-
-
-// generate the bash pattern test-fixtures if possible
-if (process.platform === "win32" || !process.env.TEST_REGEN) {
-  console.error("Windows, or TEST_REGEN unset.  Using cached fixtures.")
-  return
-}
-
-var spawn = require("child_process").spawn;
-var globs =
-  // put more patterns here.
-  // anything that would be directly in / should be in /tmp/glob-test
-  ["test/a/*/+(c|g)/./d"
-  ,"test/a/**/[cg]/../[cg]"
-  ,"test/a/{b,c,d,e,f}/**/g"
-  ,"test/a/b/**"
-  ,"test/**/g"
-  ,"test/a/abc{fed,def}/g/h"
-  ,"test/a/abc{fed/g,def}/**/"
-  ,"test/a/abc{fed/g,def}/**///**/"
-  ,"test/**/a/**/"
-  ,"test/+(a|b|c)/a{/,bc*}/**"
-  ,"test/*/*/*/f"
-  ,"test/**/f"
-  ,"test/a/symlink/a/b/c/a/b/c/a/b/c//a/b/c////a/b/c/**/b/c/**"
-  ,"{./*/*,/tmp/glob-test/*}"
-  ,"{/tmp/glob-test/*,*}" // evil owl face!  how you taunt me!
-  ,"test/a/!(symlink)/**"
-  ]
-var bashOutput = {}
-var fs = require("fs")
-
-globs.forEach(function (pattern) {
-  tap.test("generate fixture " + pattern, function (t) {
-    var cmd = "shopt -s globstar && " +
-              "shopt -s extglob && " +
-              "shopt -s nullglob && " +
-              // "shopt >&2; " +
-              "eval \'for i in " + pattern + "; do echo $i; done\'"
-    var cp = spawn("bash", ["-c", cmd], { cwd: path.dirname(__dirname) })
-    var out = []
-    cp.stdout.on("data", function (c) {
-      out.push(c)
-    })
-    cp.stderr.pipe(process.stderr)
-    cp.on("close", function (code) {
-      out = flatten(out)
-      if (!out)
-        out = []
-      else
-        out = cleanResults(out.split(/\r*\n/))
-
-      bashOutput[pattern] = out
-      t.notOk(code, "bash test should finish nicely")
-      t.end()
-    })
-  })
-})
-
-tap.test("save fixtures", function (t) {
-  var fname = path.resolve(__dirname, "bash-results.json")
-  var data = JSON.stringify(bashOutput, null, 2) + "\n"
-  fs.writeFile(fname, data, function (er) {
-    t.ifError(er)
-    t.end()
-  })
-})
-
-function cleanResults (m) {
-  // normalize discrepancies in ordering, duplication,
-  // and ending slashes.
-  return m.map(function (m) {
-    return m.replace(/\/+/g, "/").replace(/\/$/, "")
-  }).sort(alphasort).reduce(function (set, f) {
-    if (f !== set[set.length - 1]) set.push(f)
-    return set
-  }, []).sort(alphasort).map(function (f) {
-    // de-windows
-    return (process.platform !== 'win32') ? f
-           : f.replace(/^[a-zA-Z]:\\\\/, '/').replace(/\\/g, '/')
-  })
-}
-
-function flatten (chunks) {
-  var s = 0
-  chunks.forEach(function (c) { s += c.length })
-  var out = new Buffer(s)
-  s = 0
-  chunks.forEach(function (c) {
-    c.copy(out, s)
-    s += c.length
-  })
-
-  return out.toString().trim()
-}
-
-function alphasort (a, b) {
-  a = a.toLowerCase()
-  b = b.toLowerCase()
-  return a > b ? 1 : a < b ? -1 : 0
-}
diff --git a/node_modules/glob/test/bash-comparison.js b/node_modules/glob/test/bash-comparison.js
deleted file mode 100644
index 239ed1a9c3..0000000000
--- a/node_modules/glob/test/bash-comparison.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// basic test
-// show that it does the same thing by default as the shell.
-var tap = require("tap")
-, child_process = require("child_process")
-, bashResults = require("./bash-results.json")
-, globs = Object.keys(bashResults)
-, glob = require("../")
-, path = require("path")
-
-// run from the root of the project
-// this is usually where you're at anyway, but be sure.
-process.chdir(path.resolve(__dirname, ".."))
-
-function alphasort (a, b) {
-  a = a.toLowerCase()
-  b = b.toLowerCase()
-  return a > b ? 1 : a < b ? -1 : 0
-}
-
-globs.forEach(function (pattern) {
-  var expect = bashResults[pattern]
-  // anything regarding the symlink thing will fail on windows, so just skip it
-  if (process.platform === "win32" &&
-      expect.some(function (m) {
-        return /\/symlink\//.test(m)
-      }))
-    return
-
-  tap.test(pattern, function (t) {
-    glob(pattern, function (er, matches) {
-      if (er)
-        throw er
-
-      // sort and unmark, just to match the shell results
-      matches = cleanResults(matches)
-
-      t.deepEqual(matches, expect, pattern)
-      t.end()
-    })
-  })
-
-  tap.test(pattern + " sync", function (t) {
-    var matches = cleanResults(glob.sync(pattern))
-
-    t.deepEqual(matches, expect, "should match shell")
-    t.end()
-  })
-})
-
-function cleanResults (m) {
-  // normalize discrepancies in ordering, duplication,
-  // and ending slashes.
-  return m.map(function (m) {
-    return m.replace(/\/+/g, "/").replace(/\/$/, "")
-  }).sort(alphasort).reduce(function (set, f) {
-    if (f !== set[set.length - 1]) set.push(f)
-    return set
-  }, []).sort(alphasort).map(function (f) {
-    // de-windows
-    return (process.platform !== 'win32') ? f
-           : f.replace(/^[a-zA-Z]:[\/\\]+/, '/').replace(/[\\\/]+/g, '/')
-  })
-}
diff --git a/node_modules/glob/test/bash-results.json b/node_modules/glob/test/bash-results.json
deleted file mode 100644
index 3ffadba683..0000000000
--- a/node_modules/glob/test/bash-results.json
+++ /dev/null
@@ -1,349 +0,0 @@
-{
-  "test/a/*/+(c|g)/./d": [
-    "test/a/b/c/./d"
-  ],
-  "test/a/**/[cg]/../[cg]": [
-    "test/a/abcdef/g/../g",
-    "test/a/abcfed/g/../g",
-    "test/a/b/c/../c",
-    "test/a/c/../c",
-    "test/a/c/d/c/../c",
-    "test/a/symlink/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/../c"
-  ],
-  "test/a/{b,c,d,e,f}/**/g": [],
-  "test/a/b/**": [
-    "test/a/b",
-    "test/a/b/c",
-    "test/a/b/c/d"
-  ],
-  "test/**/g": [
-    "test/a/abcdef/g",
-    "test/a/abcfed/g"
-  ],
-  "test/a/abc{fed,def}/g/h": [
-    "test/a/abcdef/g/h",
-    "test/a/abcfed/g/h"
-  ],
-  "test/a/abc{fed/g,def}/**/": [
-    "test/a/abcdef",
-    "test/a/abcdef/g",
-    "test/a/abcfed/g"
-  ],
-  "test/a/abc{fed/g,def}/**///**/": [
-    "test/a/abcdef",
-    "test/a/abcdef/g",
-    "test/a/abcfed/g"
-  ],
-  "test/**/a/**/": [
-    "test/a",
-    "test/a/abcdef",
-    "test/a/abcdef/g",
-    "test/a/abcfed",
-    "test/a/abcfed/g",
-    "test/a/b",
-    "test/a/b/c",
-    "test/a/bc",
-    "test/a/bc/e",
-    "test/a/c",
-    "test/a/c/d",
-    "test/a/c/d/c",
-    "test/a/cb",
-    "test/a/cb/e",
-    "test/a/symlink",
-    "test/a/symlink/a",
-    "test/a/symlink/a/b",
-    "test/a/symlink/a/b/c",
-    "test/a/symlink/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b"
-  ],
-  "test/+(a|b|c)/a{/,bc*}/**": [
-    "test/a/abcdef",
-    "test/a/abcdef/g",
-    "test/a/abcdef/g/h",
-    "test/a/abcfed",
-    "test/a/abcfed/g",
-    "test/a/abcfed/g/h"
-  ],
-  "test/*/*/*/f": [
-    "test/a/bc/e/f",
-    "test/a/cb/e/f"
-  ],
-  "test/**/f": [
-    "test/a/bc/e/f",
-    "test/a/cb/e/f"
-  ],
-  "test/a/symlink/a/b/c/a/b/c/a/b/c//a/b/c////a/b/c/**/b/c/**": [
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b",
-    "test/a/symlink/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c/a/b/c"
-  ],
-  "{./*/*,/tmp/glob-test/*}": [
-    "./examples/g.js",
-    "./examples/usr-local.js",
-    "./node_modules/inherits",
-    "./node_modules/minimatch",
-    "./node_modules/mkdirp",
-    "./node_modules/rimraf",
-    "./node_modules/tap",
-    "./test/00-setup.js",
-    "./test/a",
-    "./test/bash-comparison.js",
-    "./test/bash-results.json",
-    "./test/cwd-test.js",
-    "./test/globstar-match.js",
-    "./test/mark.js",
-    "./test/nocase-nomagic.js",
-    "./test/pause-resume.js",
-    "./test/root-nomount.js",
-    "./test/root.js",
-    "./test/stat.js",
-    "./test/zz-cleanup.js",
-    "/tmp/glob-test/asdf",
-    "/tmp/glob-test/bar",
-    "/tmp/glob-test/baz",
-    "/tmp/glob-test/foo",
-    "/tmp/glob-test/quux",
-    "/tmp/glob-test/qwer",
-    "/tmp/glob-test/rewq"
-  ],
-  "{/tmp/glob-test/*,*}": [
-    "/tmp/glob-test/asdf",
-    "/tmp/glob-test/bar",
-    "/tmp/glob-test/baz",
-    "/tmp/glob-test/foo",
-    "/tmp/glob-test/quux",
-    "/tmp/glob-test/qwer",
-    "/tmp/glob-test/rewq",
-    "examples",
-    "glob.js",
-    "LICENSE",
-    "node_modules",
-    "package.json",
-    "README.md",
-    "test"
-  ],
-  "test/a/!(symlink)/**": [
-    "test/a/abcdef",
-    "test/a/abcdef/g",
-    "test/a/abcdef/g/h",
-    "test/a/abcfed",
-    "test/a/abcfed/g",
-    "test/a/abcfed/g/h",
-    "test/a/b",
-    "test/a/b/c",
-    "test/a/b/c/d",
-    "test/a/bc",
-    "test/a/bc/e",
-    "test/a/bc/e/f",
-    "test/a/c",
-    "test/a/c/d",
-    "test/a/c/d/c",
-    "test/a/c/d/c/b",
-    "test/a/cb",
-    "test/a/cb/e",
-    "test/a/cb/e/f"
-  ]
-}
diff --git a/node_modules/glob/test/cwd-test.js b/node_modules/glob/test/cwd-test.js
deleted file mode 100644
index 352c27efad..0000000000
--- a/node_modules/glob/test/cwd-test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var tap = require("tap")
-
-var origCwd = process.cwd()
-process.chdir(__dirname)
-
-tap.test("changing cwd and searching for **/d", function (t) {
-  var glob = require('../')
-  var path = require('path')
-  t.test('.', function (t) {
-    glob('**/d', function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ 'a/b/c/d', 'a/c/d' ])
-      t.end()
-    })
-  })
-
-  t.test('a', function (t) {
-    glob('**/d', {cwd:path.resolve('a')}, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ 'b/c/d', 'c/d' ])
-      t.end()
-    })
-  })
-
-  t.test('a/b', function (t) {
-    glob('**/d', {cwd:path.resolve('a/b')}, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ 'c/d' ])
-      t.end()
-    })
-  })
-
-  t.test('a/b/', function (t) {
-    glob('**/d', {cwd:path.resolve('a/b/')}, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ 'c/d' ])
-      t.end()
-    })
-  })
-
-  t.test('.', function (t) {
-    glob('**/d', {cwd: process.cwd()}, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ 'a/b/c/d', 'a/c/d' ])
-      t.end()
-    })
-  })
-
-  t.test('cd -', function (t) {
-    process.chdir(origCwd)
-    t.end()
-  })
-
-  t.end()
-})
diff --git a/node_modules/glob/test/globstar-match.js b/node_modules/glob/test/globstar-match.js
deleted file mode 100644
index 9b234fa2a8..0000000000
--- a/node_modules/glob/test/globstar-match.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var Glob = require("../glob.js").Glob
-var test = require('tap').test
-
-test('globstar should not have dupe matches', function(t) {
-  var pattern = 'a/**/[gh]'
-  var g = new Glob(pattern, { cwd: __dirname })
-  var matches = []
-  g.on('match', function(m) {
-    console.error('match %j', m)
-    matches.push(m)
-  })
-  g.on('end', function(set) {
-    console.error('set', set)
-    matches = matches.sort()
-    set = set.sort()
-    t.same(matches, set, 'should have same set of matches')
-    t.end()
-  })
-})
diff --git a/node_modules/glob/test/mark.js b/node_modules/glob/test/mark.js
deleted file mode 100644
index ed68a335c3..0000000000
--- a/node_modules/glob/test/mark.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var test = require("tap").test
-var glob = require('../')
-process.chdir(__dirname)
-
-test("mark, no / on pattern", function (t) {
-  glob("a/*", {mark: true}, function (er, results) {
-    if (er)
-      throw er
-    var expect = [ 'a/abcdef/',
-                   'a/abcfed/',
-                   'a/b/',
-                   'a/bc/',
-                   'a/c/',
-                   'a/cb/' ]
-
-    if (process.platform !== "win32")
-      expect.push('a/symlink/')
-
-    t.same(results, expect)
-    t.end()
-  })
-})
-
-test("mark=false, no / on pattern", function (t) {
-  glob("a/*", function (er, results) {
-    if (er)
-      throw er
-    var expect = [ 'a/abcdef',
-                   'a/abcfed',
-                   'a/b',
-                   'a/bc',
-                   'a/c',
-                   'a/cb' ]
-
-    if (process.platform !== "win32")
-      expect.push('a/symlink')
-    t.same(results, expect)
-    t.end()
-  })
-})
-
-test("mark=true, / on pattern", function (t) {
-  glob("a/*/", {mark: true}, function (er, results) {
-    if (er)
-      throw er
-    var expect = [ 'a/abcdef/',
-                    'a/abcfed/',
-                    'a/b/',
-                    'a/bc/',
-                    'a/c/',
-                    'a/cb/' ]
-    if (process.platform !== "win32")
-      expect.push('a/symlink/')
-    t.same(results, expect)
-    t.end()
-  })
-})
-
-test("mark=false, / on pattern", function (t) {
-  glob("a/*/", function (er, results) {
-    if (er)
-      throw er
-    var expect = [ 'a/abcdef/',
-                   'a/abcfed/',
-                   'a/b/',
-                   'a/bc/',
-                   'a/c/',
-                   'a/cb/' ]
-    if (process.platform !== "win32")
-      expect.push('a/symlink/')
-    t.same(results, expect)
-    t.end()
-  })
-})
diff --git a/node_modules/glob/test/nocase-nomagic.js b/node_modules/glob/test/nocase-nomagic.js
deleted file mode 100644
index 2503f23101..0000000000
--- a/node_modules/glob/test/nocase-nomagic.js
+++ /dev/null
@@ -1,113 +0,0 @@
-var fs = require('fs');
-var test = require('tap').test;
-var glob = require('../');
-
-test('mock fs', function(t) {
-  var stat = fs.stat
-  var statSync = fs.statSync
-  var readdir = fs.readdir
-  var readdirSync = fs.readdirSync
-
-  function fakeStat(path) {
-    var ret
-    switch (path.toLowerCase()) {
-      case '/tmp': case '/tmp/':
-        ret = { isDirectory: function() { return true } }
-        break
-      case '/tmp/a':
-        ret = { isDirectory: function() { return false } }
-        break
-    }
-    return ret
-  }
-
-  fs.stat = function(path, cb) {
-    var f = fakeStat(path);
-    if (f) {
-      process.nextTick(function() {
-        cb(null, f)
-      })
-    } else {
-      stat.call(fs, path, cb)
-    }
-  }
-
-  fs.statSync = function(path) {
-    return fakeStat(path) || statSync.call(fs, path)
-  }
-
-  function fakeReaddir(path) {
-    var ret
-    switch (path.toLowerCase()) {
-      case '/tmp': case '/tmp/':
-        ret = [ 'a', 'A' ]
-        break
-      case '/':
-        ret = ['tmp', 'tMp', 'tMP', 'TMP']
-    }
-    return ret
-  }
-
-  fs.readdir = function(path, cb) {
-    var f = fakeReaddir(path)
-    if (f)
-      process.nextTick(function() {
-        cb(null, f)
-      })
-    else
-      readdir.call(fs, path, cb)
-  }
-
-  fs.readdirSync = function(path) {
-    return fakeReaddir(path) || readdirSync.call(fs, path)
-  }
-
-  t.pass('mocked')
-  t.end()
-})
-
-test('nocase, nomagic', function(t) {
-  var n = 2
-  var want = [ '/TMP/A',
-               '/TMP/a',
-               '/tMP/A',
-               '/tMP/a',
-               '/tMp/A',
-               '/tMp/a',
-               '/tmp/A',
-               '/tmp/a' ]
-  glob('/tmp/a', { nocase: true }, function(er, res) {
-    if (er)
-      throw er
-    t.same(res.sort(), want)
-    if (--n === 0) t.end()
-  })
-  glob('/tmp/A', { nocase: true }, function(er, res) {
-    if (er)
-      throw er
-    t.same(res.sort(), want)
-    if (--n === 0) t.end()
-  })
-})
-
-test('nocase, with some magic', function(t) {
-  t.plan(2)
-  var want = [ '/TMP/A',
-               '/TMP/a',
-               '/tMP/A',
-               '/tMP/a',
-               '/tMp/A',
-               '/tMp/a',
-               '/tmp/A',
-               '/tmp/a' ]
-  glob('/tmp/*', { nocase: true }, function(er, res) {
-    if (er)
-      throw er
-    t.same(res.sort(), want)
-  })
-  glob('/tmp/*', { nocase: true }, function(er, res) {
-    if (er)
-      throw er
-    t.same(res.sort(), want)
-  })
-})
diff --git a/node_modules/glob/test/pause-resume.js b/node_modules/glob/test/pause-resume.js
deleted file mode 100644
index e1ffbab1c5..0000000000
--- a/node_modules/glob/test/pause-resume.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// show that no match events happen while paused.
-var tap = require("tap")
-, child_process = require("child_process")
-// just some gnarly pattern with lots of matches
-, pattern = "test/a/!(symlink)/**"
-, bashResults = require("./bash-results.json")
-, patterns = Object.keys(bashResults)
-, glob = require("../")
-, Glob = glob.Glob
-, path = require("path")
-
-// run from the root of the project
-// this is usually where you're at anyway, but be sure.
-process.chdir(path.resolve(__dirname, ".."))
-
-function alphasort (a, b) {
-  a = a.toLowerCase()
-  b = b.toLowerCase()
-  return a > b ? 1 : a < b ? -1 : 0
-}
-
-function cleanResults (m) {
-  // normalize discrepancies in ordering, duplication,
-  // and ending slashes.
-  return m.map(function (m) {
-    return m.replace(/\/+/g, "/").replace(/\/$/, "")
-  }).sort(alphasort).reduce(function (set, f) {
-    if (f !== set[set.length - 1]) set.push(f)
-    return set
-  }, []).sort(alphasort).map(function (f) {
-    // de-windows
-    return (process.platform !== 'win32') ? f
-           : f.replace(/^[a-zA-Z]:\\\\/, '/').replace(/\\/g, '/')
-  })
-}
-
-var globResults = []
-tap.test("use a Glob object, and pause/resume it", function (t) {
-  var g = new Glob(pattern)
-  , paused = false
-  , res = []
-  , expect = bashResults[pattern]
-
-  g.on("pause", function () {
-    console.error("pause")
-  })
-
-  g.on("resume", function () {
-    console.error("resume")
-  })
-
-  g.on("match", function (m) {
-    t.notOk(g.paused, "must not be paused")
-    globResults.push(m)
-    g.pause()
-    t.ok(g.paused, "must be paused")
-    setTimeout(g.resume.bind(g), 10)
-  })
-
-  g.on("end", function (matches) {
-    t.pass("reached glob end")
-    globResults = cleanResults(globResults)
-    matches = cleanResults(matches)
-    t.deepEqual(matches, globResults,
-      "end event matches should be the same as match events")
-
-    t.deepEqual(matches, expect,
-      "glob matches should be the same as bash results")
-
-    t.end()
-  })
-})
-
diff --git a/node_modules/glob/test/root-nomount.js b/node_modules/glob/test/root-nomount.js
deleted file mode 100644
index 3ac5979b05..0000000000
--- a/node_modules/glob/test/root-nomount.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var tap = require("tap")
-
-var origCwd = process.cwd()
-process.chdir(__dirname)
-
-tap.test("changing root and searching for /b*/**", function (t) {
-  var glob = require('../')
-  var path = require('path')
-  t.test('.', function (t) {
-    glob('/b*/**', { globDebug: true, root: '.', nomount: true }, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [])
-      t.end()
-    })
-  })
-
-  t.test('a', function (t) {
-    glob('/b*/**', { globDebug: true, root: path.resolve('a'), nomount: true }, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ '/b', '/b/c', '/b/c/d', '/bc', '/bc/e', '/bc/e/f' ])
-      t.end()
-    })
-  })
-
-  t.test('root=a, cwd=a/b', function (t) {
-    glob('/b*/**', { globDebug: true, root: 'a', cwd: path.resolve('a/b'), nomount: true }, function (er, matches) {
-      t.ifError(er)
-      t.like(matches, [ '/b', '/b/c', '/b/c/d', '/bc', '/bc/e', '/bc/e/f' ])
-      t.end()
-    })
-  })
-
-  t.test('cd -', function (t) {
-    process.chdir(origCwd)
-    t.end()
-  })
-
-  t.end()
-})
diff --git a/node_modules/glob/test/root.js b/node_modules/glob/test/root.js
deleted file mode 100644
index 95c23f99ca..0000000000
--- a/node_modules/glob/test/root.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var t = require("tap")
-
-var origCwd = process.cwd()
-process.chdir(__dirname)
-
-var glob = require('../')
-var path = require('path')
-
-t.test('.', function (t) {
-  glob('/b*/**', { globDebug: true, root: '.' }, function (er, matches) {
-    t.ifError(er)
-    t.like(matches, [])
-    t.end()
-  })
-})
-
-
-t.test('a', function (t) {
-  console.error("root=" + path.resolve('a'))
-  glob('/b*/**', { globDebug: true, root: path.resolve('a') }, function (er, matches) {
-    t.ifError(er)
-    var wanted = [
-        '/b', '/b/c', '/b/c/d', '/bc', '/bc/e', '/bc/e/f'
-      ].map(function (m) {
-        return path.join(path.resolve('a'), m).replace(/\\/g, '/')
-      })
-
-    t.like(matches, wanted)
-    t.end()
-  })
-})
-
-t.test('root=a, cwd=a/b', function (t) {
-  glob('/b*/**', { globDebug: true, root: 'a', cwd: path.resolve('a/b') }, function (er, matches) {
-    t.ifError(er)
-    t.like(matches, [ '/b', '/b/c', '/b/c/d', '/bc', '/bc/e', '/bc/e/f' ].map(function (m) {
-      return path.join(path.resolve('a'), m).replace(/\\/g, '/')
-    }))
-    t.end()
-  })
-})
-
-t.test('cd -', function (t) {
-  process.chdir(origCwd)
-  t.end()
-})
diff --git a/node_modules/glob/test/stat.js b/node_modules/glob/test/stat.js
deleted file mode 100644
index 62917114b4..0000000000
--- a/node_modules/glob/test/stat.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var glob = require('../')
-var test = require('tap').test
-var path = require('path')
-
-test('stat all the things', function(t) {
-  var g = new glob.Glob('a/*abc*/**', { stat: true, cwd: __dirname })
-  var matches = []
-  g.on('match', function(m) {
-    matches.push(m)
-  })
-  var stats = []
-  g.on('stat', function(m) {
-    stats.push(m)
-  })
-  g.on('end', function(eof) {
-    stats = stats.sort()
-    matches = matches.sort()
-    eof = eof.sort()
-    t.same(stats, matches)
-    t.same(eof, matches)
-    var cache = Object.keys(this.statCache)
-    t.same(cache.map(function (f) {
-      return path.relative(__dirname, f)
-    }).sort(), matches)
-
-    cache.forEach(function(c) {
-      t.equal(typeof this.statCache[c], 'object')
-    }, this)
-
-    t.end()
-  })
-})
diff --git a/node_modules/glob/test/zz-cleanup.js b/node_modules/glob/test/zz-cleanup.js
deleted file mode 100644
index e085f0fa77..0000000000
--- a/node_modules/glob/test/zz-cleanup.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// remove the fixtures
-var tap = require("tap")
-, rimraf = require("rimraf")
-, path = require("path")
-
-tap.test("cleanup fixtures", function (t) {
-  rimraf(path.resolve(__dirname, "a"), function (er) {
-    t.ifError(er, "removed")
-    t.end()
-  })
-})
diff --git a/node_modules/graceful-fs/test/open.js b/node_modules/graceful-fs/test/open.js
deleted file mode 100644
index 104f36b0b9..0000000000
--- a/node_modules/graceful-fs/test/open.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var test = require('tap').test
-var fs = require('../graceful-fs.js')
-
-test('graceful fs is monkeypatched fs', function (t) {
-  t.equal(fs, require('fs'))
-  t.end()
-})
-
-test('open an existing file works', function (t) {
-  var fd = fs.openSync(__filename, 'r')
-  fs.closeSync(fd)
-  fs.open(__filename, 'r', function (er, fd) {
-    if (er) throw er
-    fs.close(fd, function (er) {
-      if (er) throw er
-      t.pass('works')
-      t.end()
-    })
-  })
-})
-
-test('open a non-existing file throws', function (t) {
-  var er
-  try {
-    var fd = fs.openSync('this file does not exist', 'r')
-  } catch (x) {
-    er = x
-  }
-  t.ok(er, 'should throw')
-  t.notOk(fd, 'should not get an fd')
-  t.equal(er.code, 'ENOENT')
-
-  fs.open('neither does this file', 'r', function (er, fd) {
-    t.ok(er, 'should throw')
-    t.notOk(fd, 'should not get an fd')
-    t.equal(er.code, 'ENOENT')
-    t.end()
-  })
-})
diff --git a/node_modules/inherits/test.js b/node_modules/inherits/test.js
deleted file mode 100644
index fc53012d31..0000000000
--- a/node_modules/inherits/test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var inherits = require('./inherits.js')
-var assert = require('assert')
-
-function test(c) {
-  assert(c.constructor === Child)
-  assert(c.constructor.super_ === Parent)
-  assert(Object.getPrototypeOf(c) === Child.prototype)
-  assert(Object.getPrototypeOf(Object.getPrototypeOf(c)) === Parent.prototype)
-  assert(c instanceof Child)
-  assert(c instanceof Parent)
-}
-
-function Child() {
-  Parent.call(this)
-  test(this)
-}
-
-function Parent() {}
-
-inherits(Child, Parent)
-
-var c = new Child
-test(c)
-
-console.log('ok')
diff --git a/node_modules/minimatch/node_modules/sigmund/test/basic.js b/node_modules/minimatch/node_modules/sigmund/test/basic.js
deleted file mode 100644
index 50c53a13e9..0000000000
--- a/node_modules/minimatch/node_modules/sigmund/test/basic.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var test = require('tap').test
-var sigmund = require('../sigmund.js')
-
-
-// occasionally there are duplicates
-// that's an acceptable edge-case.  JSON.stringify and util.inspect
-// have some collision potential as well, though less, and collision
-// detection is expensive.
-var hash = '{abc/def/g{0h1i2{jkl'
-var obj1 = {a:'b',c:/def/,g:['h','i',{j:'',k:'l'}]}
-var obj2 = {a:'b',c:'/def/',g:['h','i','{jkl']}
-
-var obj3 = JSON.parse(JSON.stringify(obj1))
-obj3.c = /def/
-obj3.g[2].cycle = obj3
-var cycleHash = '{abc/def/g{0h1i2{jklcycle'
-
-test('basic', function (t) {
-    t.equal(sigmund(obj1), hash)
-    t.equal(sigmund(obj2), hash)
-    t.equal(sigmund(obj3), cycleHash)
-    t.end()
-})
-
diff --git a/node_modules/minimatch/test/brace-expand.js b/node_modules/minimatch/test/brace-expand.js
deleted file mode 100644
index 7ee278a274..0000000000
--- a/node_modules/minimatch/test/brace-expand.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var tap = require("tap")
-  , minimatch = require("../")
-
-tap.test("brace expansion", function (t) {
-  // [ pattern, [expanded] ]
-  ; [ [ "a{b,c{d,e},{f,g}h}x{y,z}"
-      , [ "abxy"
-        , "abxz"
-        , "acdxy"
-        , "acdxz"
-        , "acexy"
-        , "acexz"
-        , "afhxy"
-        , "afhxz"
-        , "aghxy"
-        , "aghxz" ] ]
-    , [ "a{1..5}b"
-      , [ "a1b"
-        , "a2b"
-        , "a3b"
-        , "a4b"
-        , "a5b" ] ]
-    , [ "a{b}c", ["a{b}c"] ]
-  ].forEach(function (tc) {
-    var p = tc[0]
-      , expect = tc[1]
-    t.equivalent(minimatch.braceExpand(p), expect, p)
-  })
-  console.error("ending")
-  t.end()
-})
-
-
diff --git a/node_modules/minimatch/test/caching.js b/node_modules/minimatch/test/caching.js
deleted file mode 100644
index 0fec4b0fad..0000000000
--- a/node_modules/minimatch/test/caching.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var Minimatch = require("../minimatch.js").Minimatch
-var tap = require("tap")
-tap.test("cache test", function (t) {
-  var mm1 = new Minimatch("a?b")
-  var mm2 = new Minimatch("a?b")
-  t.equal(mm1, mm2, "should get the same object")
-  // the lru should drop it after 100 entries
-  for (var i = 0; i < 100; i ++) {
-    new Minimatch("a"+i)
-  }
-  mm2 = new Minimatch("a?b")
-  t.notEqual(mm1, mm2, "cache should have dropped")
-  t.end()
-})
diff --git a/node_modules/minimatch/test/defaults.js b/node_modules/minimatch/test/defaults.js
deleted file mode 100644
index 25f1f601cd..0000000000
--- a/node_modules/minimatch/test/defaults.js
+++ /dev/null
@@ -1,274 +0,0 @@
-// http://www.bashcookbook.com/bashinfo/source/bash-1.14.7/tests/glob-test
-//
-// TODO: Some of these tests do very bad things with backslashes, and will
-// most likely fail badly on windows.  They should probably be skipped.
-
-var tap = require("tap")
-  , globalBefore = Object.keys(global)
-  , mm = require("../")
-  , files = [ "a", "b", "c", "d", "abc"
-            , "abd", "abe", "bb", "bcd"
-            , "ca", "cb", "dd", "de"
-            , "bdir/", "bdir/cfile"]
-  , next = files.concat([ "a-b", "aXb"
-                        , ".x", ".y" ])
-
-tap.test("basic tests", function (t) {
-  var start = Date.now()
-
-  // [ pattern, [matches], MM opts, files, TAP opts]
-  ; [ "http://www.bashcookbook.com/bashinfo" +
-      "/source/bash-1.14.7/tests/glob-test"
-    , ["a*", ["a", "abc", "abd", "abe"]]
-    , ["X*", ["X*"], {nonull: true}]
-
-    // allow null glob expansion
-    , ["X*", []]
-
-    // isaacs: Slightly different than bash/sh/ksh
-    // \\* is not un-escaped to literal "*" in a failed match,
-    // but it does make it get treated as a literal star
-    , ["\\*", ["\\*"], {nonull: true}]
-    , ["\\**", ["\\**"], {nonull: true}]
-    , ["\\*\\*", ["\\*\\*"], {nonull: true}]
-
-    , ["b*/", ["bdir/"]]
-    , ["c*", ["c", "ca", "cb"]]
-    , ["**", files]
-
-    , ["\\.\\./*/", ["\\.\\./*/"], {nonull: true}]
-    , ["s/\\..*//", ["s/\\..*//"], {nonull: true}]
-
-    , "legendary larry crashes bashes"
-    , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\\1/"
-      , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\\1/"], {nonull: true}]
-    , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\1/"
-      , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\1/"], {nonull: true}]
-
-    , "character classes"
-    , ["[a-c]b*", ["abc", "abd", "abe", "bb", "cb"]]
-    , ["[a-y]*[^c]", ["abd", "abe", "bb", "bcd",
-       "bdir/", "ca", "cb", "dd", "de"]]
-    , ["a*[^c]", ["abd", "abe"]]
-    , function () { files.push("a-b", "aXb") }
-    , ["a[X-]b", ["a-b", "aXb"]]
-    , function () { files.push(".x", ".y") }
-    , ["[^a-c]*", ["d", "dd", "de"]]
-    , function () { files.push("a*b/", "a*b/ooo") }
-    , ["a\\*b/*", ["a*b/ooo"]]
-    , ["a\\*?/*", ["a*b/ooo"]]
-    , ["*\\\\!*", [], {null: true}, ["echo !7"]]
-    , ["*\\!*", ["echo !7"], null, ["echo !7"]]
-    , ["*.\\*", ["r.*"], null, ["r.*"]]
-    , ["a[b]c", ["abc"]]
-    , ["a[\\b]c", ["abc"]]
-    , ["a?c", ["abc"]]
-    , ["a\\*c", [], {null: true}, ["abc"]]
-    , ["", [""], { null: true }, [""]]
-
-    , "http://www.opensource.apple.com/source/bash/bash-23/" +
-      "bash/tests/glob-test"
-    , function () { files.push("man/", "man/man1/", "man/man1/bash.1") }
-    , ["*/man*/bash.*", ["man/man1/bash.1"]]
-    , ["man/man1/bash.1", ["man/man1/bash.1"]]
-    , ["a***c", ["abc"], null, ["abc"]]
-    , ["a*****?c", ["abc"], null, ["abc"]]
-    , ["?*****??", ["abc"], null, ["abc"]]
-    , ["*****??", ["abc"], null, ["abc"]]
-    , ["?*****?c", ["abc"], null, ["abc"]]
-    , ["?***?****c", ["abc"], null, ["abc"]]
-    , ["?***?****?", ["abc"], null, ["abc"]]
-    , ["?***?****", ["abc"], null, ["abc"]]
-    , ["*******c", ["abc"], null, ["abc"]]
-    , ["*******?", ["abc"], null, ["abc"]]
-    , ["a*cd**?**??k", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["a**?**cd**?**??k", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["a**?**cd**?**??k***", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["a**?**cd**?**??***k", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["a**?**cd**?**??***k**", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["a****c**?**??*****", ["abcdecdhjk"], null, ["abcdecdhjk"]]
-    , ["[-abc]", ["-"], null, ["-"]]
-    , ["[abc-]", ["-"], null, ["-"]]
-    , ["\\", ["\\"], null, ["\\"]]
-    , ["[\\\\]", ["\\"], null, ["\\"]]
-    , ["[[]", ["["], null, ["["]]
-    , ["[", ["["], null, ["["]]
-    , ["[*", ["[abc"], null, ["[abc"]]
-    , "a right bracket shall lose its special meaning and\n" +
-      "represent itself in a bracket expression if it occurs\n" +
-      "first in the list.  -- POSIX.2 2.8.3.2"
-    , ["[]]", ["]"], null, ["]"]]
-    , ["[]-]", ["]"], null, ["]"]]
-    , ["[a-\z]", ["p"], null, ["p"]]
-    , ["??**********?****?", [], { null: true }, ["abc"]]
-    , ["??**********?****c", [], { null: true }, ["abc"]]
-    , ["?************c****?****", [], { null: true }, ["abc"]]
-    , ["*c*?**", [], { null: true }, ["abc"]]
-    , ["a*****c*?**", [], { null: true }, ["abc"]]
-    , ["a********???*******", [], { null: true }, ["abc"]]
-    , ["[]", [], { null: true }, ["a"]]
-    , ["[abc", [], { null: true }, ["["]]
-
-    , "nocase tests"
-    , ["XYZ", ["xYz"], { nocase: true, null: true }
-      , ["xYz", "ABC", "IjK"]]
-    , ["ab*", ["ABC"], { nocase: true, null: true }
-      , ["xYz", "ABC", "IjK"]]
-    , ["[ia]?[ck]", ["ABC", "IjK"], { nocase: true, null: true }
-      , ["xYz", "ABC", "IjK"]]
-
-    // [ pattern, [matches], MM opts, files, TAP opts]
-    , "onestar/twostar"
-    , ["{/*,*}", [], {null: true}, ["/asdf/asdf/asdf"]]
-    , ["{/?,*}", ["/a", "bb"], {null: true}
-      , ["/a", "/b/b", "/a/b/c", "bb"]]
-
-    , "dots should not match unless requested"
-    , ["**", ["a/b"], {}, ["a/b", "a/.d", ".a/.d"]]
-
-    // .. and . can only match patterns starting with .,
-    // even when options.dot is set.
-    , function () {
-        files = ["a/./b", "a/../b", "a/c/b", "a/.d/b"]
-      }
-    , ["a/*/b", ["a/c/b", "a/.d/b"], {dot: true}]
-    , ["a/.*/b", ["a/./b", "a/../b", "a/.d/b"], {dot: true}]
-    , ["a/*/b", ["a/c/b"], {dot:false}]
-    , ["a/.*/b", ["a/./b", "a/../b", "a/.d/b"], {dot: false}]
-
-
-    // this also tests that changing the options needs
-    // to change the cache key, even if the pattern is
-    // the same!
-    , ["**", ["a/b","a/.d",".a/.d"], { dot: true }
-      , [ ".a/.d", "a/.d", "a/b"]]
-
-    , "paren sets cannot contain slashes"
-    , ["*(a/b)", ["*(a/b)"], {nonull: true}, ["a/b"]]
-
-    // brace sets trump all else.
-    //
-    // invalid glob pattern.  fails on bash4 and bsdglob.
-    // however, in this implementation, it's easier just
-    // to do the intuitive thing, and let brace-expansion
-    // actually come before parsing any extglob patterns,
-    // like the documentation seems to say.
-    //
-    // XXX: if anyone complains about this, either fix it
-    // or tell them to grow up and stop complaining.
-    //
-    // bash/bsdglob says this:
-    // , ["*(a|{b),c)}", ["*(a|{b),c)}"], {}, ["a", "ab", "ac", "ad"]]
-    // but we do this instead:
-    , ["*(a|{b),c)}", ["a", "ab", "ac"], {}, ["a", "ab", "ac", "ad"]]
-
-    // test partial parsing in the presence of comment/negation chars
-    , ["[!a*", ["[!ab"], {}, ["[!ab", "[ab"]]
-    , ["[#a*", ["[#ab"], {}, ["[#ab", "[ab"]]
-
-    // like: {a,b|c\\,d\\\|e} except it's unclosed, so it has to be escaped.
-    , ["+(a|*\\|c\\\\|d\\\\\\|e\\\\\\\\|f\\\\\\\\\\|g"
-      , ["+(a|b\\|c\\\\|d\\\\|e\\\\\\\\|f\\\\\\\\|g"]
-      , {}
-      , ["+(a|b\\|c\\\\|d\\\\|e\\\\\\\\|f\\\\\\\\|g", "a", "b\\c"]]
-
-
-    // crazy nested {,,} and *(||) tests.
-    , function () {
-        files = [ "a", "b", "c", "d"
-                , "ab", "ac", "ad"
-                , "bc", "cb"
-                , "bc,d", "c,db", "c,d"
-                , "d)", "(b|c", "*(b|c"
-                , "b|c", "b|cc", "cb|c"
-                , "x(a|b|c)", "x(a|c)"
-                , "(a|b|c)", "(a|c)"]
-      }
-    , ["*(a|{b,c})", ["a", "b", "c", "ab", "ac"]]
-    , ["{a,*(b|c,d)}", ["a","(b|c", "*(b|c", "d)"]]
-    // a
-    // *(b|c)
-    // *(b|d)
-    , ["{a,*(b|{c,d})}", ["a","b", "bc", "cb", "c", "d"]]
-    , ["*(a|{b|c,c})", ["a", "b", "c", "ab", "ac", "bc", "cb"]]
-
-
-    // test various flag settings.
-    , [ "*(a|{b|c,c})", ["x(a|b|c)", "x(a|c)", "(a|b|c)", "(a|c)"]
-      , { noext: true } ]
-    , ["a?b", ["x/y/acb", "acb/"], {matchBase: true}
-      , ["x/y/acb", "acb/", "acb/d/e", "x/y/acb/d"] ]
-    , ["#*", ["#a", "#b"], {nocomment: true}, ["#a", "#b", "c#d"]]
-
-
-    // begin channelling Boole and deMorgan...
-    , "negation tests"
-    , function () {
-        files = ["d", "e", "!ab", "!abc", "a!b", "\\!a"]
-      }
-
-    // anything that is NOT a* matches.
-    , ["!a*", ["\\!a", "d", "e", "!ab", "!abc"]]
-
-    // anything that IS !a* matches.
-    , ["!a*", ["!ab", "!abc"], {nonegate: true}]
-
-    // anything that IS a* matches
-    , ["!!a*", ["a!b"]]
-
-    // anything that is NOT !a* matches
-    , ["!\\!a*", ["a!b", "d", "e", "\\!a"]]
-
-    // negation nestled within a pattern
-    , function () {
-        files = [ "foo.js"
-                , "foo.bar"
-                // can't match this one without negative lookbehind.
-                , "foo.js.js"
-                , "blar.js"
-                , "foo."
-                , "boo.js.boo" ]
-      }
-    , ["*.!(js)", ["foo.bar", "foo.", "boo.js.boo"] ]
-
-    ].forEach(function (c) {
-      if (typeof c === "function") return c()
-      if (typeof c === "string") return t.comment(c)
-
-      var pattern = c[0]
-        , expect = c[1].sort(alpha)
-        , options = c[2] || {}
-        , f = c[3] || files
-        , tapOpts = c[4] || {}
-
-      // options.debug = true
-      var Class = mm.defaults(options).Minimatch
-      var m = new Class(pattern, {})
-      var r = m.makeRe()
-      tapOpts.re = String(r) || JSON.stringify(r)
-      tapOpts.files = JSON.stringify(f)
-      tapOpts.pattern = pattern
-      tapOpts.set = m.set
-      tapOpts.negated = m.negate
-
-      var actual = mm.match(f, pattern, options)
-      actual.sort(alpha)
-
-      t.equivalent( actual, expect
-                  , JSON.stringify(pattern) + " " + JSON.stringify(expect)
-                  , tapOpts )
-    })
-
-  t.comment("time=" + (Date.now() - start) + "ms")
-  t.end()
-})
-
-tap.test("global leak test", function (t) {
-  var globalAfter = Object.keys(global)
-  t.equivalent(globalAfter, globalBefore, "no new globals, please")
-  t.end()
-})
-
-function alpha (a, b) {
-  return a > b ? 1 : -1
-}
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/common.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/common.js
deleted file mode 100644
index 4d71b8a647..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/common.js
+++ /dev/null
@@ -1,6 +0,0 @@
-var common = module.exports;
-
-common.DelayedStream = require('..');
-common.assert = require('assert');
-common.fake = require('fake');
-common.PORT = 49252;
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-http-upload.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-http-upload.js
deleted file mode 100644
index 9ecad5b8ad..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-http-upload.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var DelayedStream = common.DelayedStream;
-var http = require('http');
-
-var UPLOAD = new Buffer(10 * 1024 * 1024);
-
-var server = http.createServer(function(req, res) {
-  var delayed = DelayedStream.create(req, {maxDataSize: UPLOAD.length});
-
-  setTimeout(function() {
-    res.writeHead(200);
-    delayed.pipe(res);
-  }, 10);
-});
-server.listen(common.PORT, function() {
-  var request = http.request({
-    method: 'POST',
-    port: common.PORT,
-  });
-
-  request.write(UPLOAD);
-  request.end();
-
-  request.on('response', function(res) {
-    var received = 0;
-    res
-      .on('data', function(chunk) {
-        received += chunk.length;
-      })
-      .on('end', function() {
-        assert.equal(received, UPLOAD.length);
-        server.close();
-      });
-  });
-});
-
-
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-auto-pause.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-auto-pause.js
deleted file mode 100644
index 6f417f3e90..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-auto-pause.js
+++ /dev/null
@@ -1,21 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testAutoPause() {
-  var source = new Stream();
-
-  fake.expect(source, 'pause', 1);
-  var delayedStream = DelayedStream.create(source);
-  fake.verify();
-})();
-
-(function testDisableAutoPause() {
-  var source = new Stream();
-  fake.expect(source, 'pause', 0);
-
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-  fake.verify();
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-pause.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-pause.js
deleted file mode 100644
index b50c39783a..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream-pause.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testDelayEventsUntilResume() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-
-  fake.expect(source, 'pause');
-  delayedStream.pause();
-  fake.verify();
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream.js
deleted file mode 100644
index fc4047e08b..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-delayed-stream.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testDelayEventsUntilResume() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-
-  // delayedStream must not emit until we resume
-  fake.expect(delayedStream, 'emit', 0);
-
-  // but our original source must emit
-  var params = [];
-  source.on('foo', function(param) {
-    params.push(param);
-  });
-
-  source.emit('foo', 1);
-  source.emit('foo', 2);
-
-  // Make sure delayedStream did not emit, and source did
-  assert.deepEqual(params, [1, 2]);
-  fake.verify();
-
-  // After resume, delayedStream must playback all events
-  fake
-    .stub(delayedStream, 'emit')
-    .times(Infinity)
-    .withArg(1, 'newListener');
-  fake.expect(delayedStream, 'emit', ['foo', 1]);
-  fake.expect(delayedStream, 'emit', ['foo', 2]);
-  fake.expect(source, 'resume');
-
-  delayedStream.resume();
-  fake.verify();
-
-  // Calling resume again will delegate to source
-  fake.expect(source, 'resume');
-  delayedStream.resume();
-  fake.verify();
-
-  // Emitting more events directly leads to them being emitted
-  fake.expect(delayedStream, 'emit', ['foo', 3]);
-  source.emit('foo', 3);
-  fake.verify();
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-handle-source-errors.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-handle-source-errors.js
deleted file mode 100644
index a9d35e72ca..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-handle-source-errors.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testHandleSourceErrors() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-
-  // We deal with this by attaching a no-op listener to 'error' on the source
-  // when creating a new DelayedStream. This way error events on the source
-  // won't throw.
-  source.emit('error', new Error('something went wrong'));
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-max-data-size.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-max-data-size.js
deleted file mode 100644
index 7638a2bf04..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-max-data-size.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testMaxDataSize() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {maxDataSize: 1024, pauseStream: false});
-
-  source.emit('data', new Buffer(1024));
-
-  fake
-    .expect(delayedStream, 'emit')
-    .withArg(1, 'error');
-  source.emit('data', new Buffer(1));
-  fake.verify();
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-pipe-resumes.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-pipe-resumes.js
deleted file mode 100644
index 7d312ab1f8..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-pipe-resumes.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testPipeReleases() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-
-  fake.expect(delayedStream, 'resume');
-  delayedStream.pipe(new Stream());
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-proxy-readable.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-proxy-readable.js
deleted file mode 100644
index d436163b7c..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/integration/test-proxy-readable.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var fake = common.fake.create();
-var DelayedStream = common.DelayedStream;
-var Stream = require('stream').Stream;
-
-(function testProxyReadableProperty() {
-  var source = new Stream();
-  var delayedStream = DelayedStream.create(source, {pauseStream: false});
-
-  source.readable = fake.value('source.readable');
-  assert.strictEqual(delayedStream.readable, source.readable);
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/run.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/run.js
deleted file mode 100755
index 0bb8e82241..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/test/run.js
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-var far = require('far').create();
-
-far.add(__dirname);
-far.include(/test-.*\.js$/);
-
-far.execute();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/common.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/common.js
deleted file mode 100644
index 81543485e0..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/common.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var common = module.exports;
-
-var path = require('path');
-var fs = require('fs');
-var root = path.join(__dirname, '..');
-
-common.dir = {
-  fixture: root + '/test/fixture',
-  tmp: root + '/test/tmp',
-};
-
-// Create tmp directory if it does not exist
-// Not using fs.exists so as to be node 0.6.x compatible
-try {
-  fs.statSync(common.dir.tmp);
-}
-catch (e) {
-  // Dir does not exist
-  fs.mkdirSync(common.dir.tmp);
-}
-
-common.CombinedStream = require(root);
-common.assert = require('assert');
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file1.txt b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file1.txt
deleted file mode 100644
index 50e0218df4..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file1.txt
+++ /dev/null
@@ -1,256 +0,0 @@
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
-10101010101010101010101010101010101010101010101010101010101010101010101010101010
-01010101010101010101010101010101010101010101010101010101010101010101010101010101
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file2.txt b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file2.txt
deleted file mode 100644
index da1d821fe8..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/fixture/file2.txt
+++ /dev/null
@@ -1,256 +0,0 @@
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
-20202020202020202020202020202020202020202020202020202020202020202020202020202020
-02020202020202020202020202020202020202020202020202020202020202020202020202020202
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-callback-streams.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-callback-streams.js
deleted file mode 100644
index 44ecabab69..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-callback-streams.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var fs = require('fs');
-
-var FILE1 = common.dir.fixture + '/file1.txt';
-var FILE2 = common.dir.fixture + '/file2.txt';
-var EXPECTED = fs.readFileSync(FILE1) + fs.readFileSync(FILE2);
-
-(function testDelayedStreams() {
-  var combinedStream = CombinedStream.create();
-  combinedStream.append(function(next) {
-    next(fs.createReadStream(FILE1));
-  });
-  combinedStream.append(function(next) {
-    next(fs.createReadStream(FILE2));
-  });
-
-  var tmpFile = common.dir.tmp + '/combined.txt';
-  var dest = fs.createWriteStream(tmpFile);
-  combinedStream.pipe(dest);
-
-  dest.on('end', function() {
-    var written = fs.readFileSync(tmpFile, 'utf8');
-    assert.strictEqual(written, EXPECTED);
-  });
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-data-size.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-data-size.js
deleted file mode 100644
index e3fbd1842f..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-data-size.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-
-(function testDataSizeGetter() {
-  var combinedStream = CombinedStream.create();
-
-  assert.strictEqual(combinedStream.dataSize, 0);
-
-  // Test one stream
-  combinedStream._streams.push({dataSize: 10});
-  combinedStream._updateDataSize();
-  assert.strictEqual(combinedStream.dataSize, 10);
-
-  // Test two streams
-  combinedStream._streams.push({dataSize: 23});
-  combinedStream._updateDataSize();
-  assert.strictEqual(combinedStream.dataSize, 33);
-
-  // Test currentStream
-  combinedStream._currentStream = {dataSize: 20};
-  combinedStream._updateDataSize();
-  assert.strictEqual(combinedStream.dataSize, 53);
-
-  // Test currentStream without dataSize
-  combinedStream._currentStream = {};
-  combinedStream._updateDataSize();
-  assert.strictEqual(combinedStream.dataSize, 33);
-
-  // Test stream function
-  combinedStream._streams.push(function() {});
-  combinedStream._updateDataSize();
-  assert.strictEqual(combinedStream.dataSize, 33);
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams-and-buffers-and-strings.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams-and-buffers-and-strings.js
deleted file mode 100644
index c678575c07..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams-and-buffers-and-strings.js
+++ /dev/null
@@ -1,38 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var fs = require('fs');
-
-var FILE1 = common.dir.fixture + '/file1.txt';
-var BUFFER = new Buffer('Bacon is delicious');
-var FILE2 = common.dir.fixture + '/file2.txt';
-var STRING = 'The € kicks the $\'s ass!';
-
-var EXPECTED =
-  fs.readFileSync(FILE1)
-  + BUFFER
-  + fs.readFileSync(FILE2)
-  + STRING;
-var GOT;
-
-(function testDelayedStreams() {
-  var combinedStream = CombinedStream.create();
-  combinedStream.append(fs.createReadStream(FILE1));
-  combinedStream.append(BUFFER);
-  combinedStream.append(fs.createReadStream(FILE2));
-  combinedStream.append(function(next) {
-    next(STRING);
-  });
-
-  var tmpFile = common.dir.tmp + '/combined-file1-buffer-file2-string.txt';
-  var dest = fs.createWriteStream(tmpFile);
-  combinedStream.pipe(dest);
-
-  dest.on('close', function() {
-    GOT = fs.readFileSync(tmpFile, 'utf8');
-  });
-})();
-
-process.on('exit', function() {
-  assert.strictEqual(GOT, EXPECTED);
-});
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams.js
deleted file mode 100644
index 263cfdf722..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-delayed-streams.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var fs = require('fs');
-
-var FILE1 = common.dir.fixture + '/file1.txt';
-var FILE2 = common.dir.fixture + '/file2.txt';
-var EXPECTED = fs.readFileSync(FILE1) + fs.readFileSync(FILE2);
-var GOT;
-
-(function testDelayedStreams() {
-  var combinedStream = CombinedStream.create();
-  combinedStream.append(fs.createReadStream(FILE1));
-  combinedStream.append(fs.createReadStream(FILE2));
-
-  var stream1 = combinedStream._streams[0];
-  var stream2 = combinedStream._streams[1];
-
-  stream1.on('end', function() {
-    assert.equal(stream2.dataSize, 0);
-  });
-
-  var tmpFile = common.dir.tmp + '/combined.txt';
-  var dest = fs.createWriteStream(tmpFile);
-  combinedStream.pipe(dest);
-
-  dest.on('close', function() {
-    GOT = fs.readFileSync(tmpFile, 'utf8');
-  });
-})();
-
-process.on('exit', function() {
-  console.error(GOT.length, EXPECTED.length);
-  assert.strictEqual(GOT, EXPECTED);
-});
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-empty-string.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-empty-string.js
deleted file mode 100644
index c3d288d013..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-empty-string.js
+++ /dev/null
@@ -1,39 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var util = require('util');
-var Stream = require('stream').Stream;
-
-var s = CombinedStream.create();
-
-
-function StringStream(){
-  this.writable=true;
-  this.str=""
-}
-util.inherits(StringStream,Stream);
-
-StringStream.prototype.write=function(chunk,encoding){
-  this.str+=chunk.toString();
-  this.emit('data',chunk);
-}
-
-StringStream.prototype.end=function(chunk,encoding){
-  this.emit('end');
-}
-
-StringStream.prototype.toString=function(){
-  return this.str;
-}
-
-
-s.append("foo.");
-s.append("");
-s.append("bar");
-
-var ss = new StringStream();
-
-s.pipe(ss);
-s.resume();
-
-assert.equal(ss.toString(),"foo.bar");
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-is-stream-like.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-is-stream-like.js
deleted file mode 100644
index aefa36e6b7..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-is-stream-like.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var fs = require('fs');
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var FILE1 = common.dir.fixture + '/file1.txt';
-var fileStream = fs.createReadStream(FILE1);
-
-var foo = function(){};
-
-(function testIsStreamLike() {
-  assert(! CombinedStream.isStreamLike(true));
-  assert(! CombinedStream.isStreamLike("I am a string"));
-  assert(! CombinedStream.isStreamLike(7));
-  assert(! CombinedStream.isStreamLike(foo));
-
-  assert(CombinedStream.isStreamLike(fileStream));
-})();
\ No newline at end of file
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-max-data-size.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-max-data-size.js
deleted file mode 100644
index 25f47a47c3..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-max-data-size.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var fs = require('fs');
-
-var FILE1 = common.dir.fixture + '/file1.txt';
-var FILE2 = common.dir.fixture + '/file2.txt';
-var EXPECTED = fs.readFileSync(FILE1) + fs.readFileSync(FILE2);
-
-(function testDelayedStreams() {
-  var combinedStream = CombinedStream.create({pauseStreams: false, maxDataSize: 20736});
-  combinedStream.append(fs.createReadStream(FILE1));
-  combinedStream.append(fs.createReadStream(FILE2));
-
-  var gotErr = null;
-  combinedStream.on('error', function(err) {
-    gotErr = err;
-  });
-
-  process.on('exit', function() {
-    assert.ok(gotErr);
-    assert.ok(gotErr.message.match(/bytes/));
-  });
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-unpaused-streams.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-unpaused-streams.js
deleted file mode 100644
index 30a3a6f84e..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/integration/test-unpaused-streams.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var CombinedStream = common.CombinedStream;
-var fs = require('fs');
-
-var FILE1 = common.dir.fixture + '/file1.txt';
-var FILE2 = common.dir.fixture + '/file2.txt';
-var EXPECTED = fs.readFileSync(FILE1) + fs.readFileSync(FILE2);
-
-(function testDelayedStreams() {
-  var combinedStream = CombinedStream.create({pauseStreams: false});
-  combinedStream.append(fs.createReadStream(FILE1));
-  combinedStream.append(fs.createReadStream(FILE2));
-
-  var stream1 = combinedStream._streams[0];
-  var stream2 = combinedStream._streams[1];
-
-  stream1.on('end', function() {
-    assert.ok(stream2.dataSize > 0);
-  });
-
-  var tmpFile = common.dir.tmp + '/combined.txt';
-  var dest = fs.createWriteStream(tmpFile);
-  combinedStream.pipe(dest);
-
-  dest.on('end', function() {
-    var written = fs.readFileSync(tmpFile, 'utf8');
-    assert.strictEqual(written, EXPECTED);
-  });
-})();
diff --git a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/run.js b/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/run.js
deleted file mode 100755
index 0bb8e82241..0000000000
--- a/node_modules/request/node_modules/form-data/node_modules/combined-stream/test/run.js
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-var far = require('far').create();
-
-far.add(__dirname);
-far.include(/test-.*\.js$/);
-
-far.execute();
diff --git a/node_modules/request/node_modules/form-data/test/common.js b/node_modules/request/node_modules/form-data/test/common.js
deleted file mode 100644
index 8a26482e1e..0000000000
--- a/node_modules/request/node_modules/form-data/test/common.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var common = module.exports;
-var path = require('path');
-
-var rootDir = path.join(__dirname, '..');
-common.dir = {
-  lib: rootDir + '/lib',
-  fixture: rootDir + '/test/fixture',
-  tmp: rootDir + '/test/tmp',
-};
-
-common.assert = require('assert');
-common.fake = require('fake');
-
-common.port = 8432;
diff --git a/node_modules/request/node_modules/form-data/test/fixture/bacon.txt b/node_modules/request/node_modules/form-data/test/fixture/bacon.txt
deleted file mode 100644
index 9804bbdc63..0000000000
--- a/node_modules/request/node_modules/form-data/test/fixture/bacon.txt
+++ /dev/null
@@ -1 +0,0 @@
-Bacon is delicious.
diff --git a/node_modules/request/node_modules/form-data/test/fixture/unicycle.jpg b/node_modules/request/node_modules/form-data/test/fixture/unicycle.jpg
deleted file mode 100644
index 7cea4dd71d..0000000000
Binary files a/node_modules/request/node_modules/form-data/test/fixture/unicycle.jpg and /dev/null differ
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-custom-filename.js b/node_modules/request/node_modules/form-data/test/integration/test-custom-filename.js
deleted file mode 100644
index 05f3fc036e..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-custom-filename.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-test custom filename and content-type:
-re: https://github.com/felixge/node-form-data/issues/29
-*/
-
-var common       = require('../common');
-var assert       = common.assert;
-var http         = require('http');
-var fs           = require('fs');
-
-var FormData     = require(common.dir.lib + '/form_data');
-var IncomingForm = require('formidable').IncomingForm;
-
-var options = {
-  filename: 'test.png',
-  contentType: 'image/gif'
-};
-
-var server = http.createServer(function(req, res) {
-
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  form
-    .on('file', function(name, file) {
-      assert.strictEqual(name, 'my_file');
-      assert.strictEqual(file.name, options.filename);
-      assert.strictEqual(file.type, options.contentType);
-    })
-    .on('end', function() {
-      res.writeHead(200);
-      res.end('done');
-    });
-});
-
-
-server.listen(common.port, function() {
-  var form = new FormData();
-
-  form.append('my_file', fs.createReadStream(common.dir.fixture + '/unicycle.jpg'), options);
-
-  form.submit('http://localhost:' + common.port + '/', function(err, res) {
-    if (err) {
-      throw err;
-    }
-
-    assert.strictEqual(res.statusCode, 200);
-    server.close();
-  });
-
-});
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-custom-headers.js b/node_modules/request/node_modules/form-data/test/integration/test-custom-headers.js
deleted file mode 100644
index 1c9b6adad5..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-custom-headers.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-test custom headers, added in pull request:
-https://github.com/felixge/node-form-data/pull/17
-*/
-
-var common = require('../common');
-var assert = common.assert;
-var http = require('http');
-
-var FormData = require(common.dir.lib + '/form_data');
-
-var CRLF = '\r\n';
-
-var testHeader = 'X-Test-Fake: 123';
-
-var expectedLength;
-
-
-var server = http.createServer(function(req, res) {
-  var data = '';
-  req.setEncoding('utf8');
-
-  req.on('data', function(d) {
-    data += d;
-  });
-
-  req.on('end', function() {
-    assert.ok( data.indexOf( testHeader ) != -1 );
-
-    // content-length would be 1000+ w/actual buffer size,
-    // but smaller w/overridden size.
-    assert.ok( typeof req.headers['content-length'] !== 'undefined' );
-    assert.equal(req.headers['content-length'], expectedLength);
-
-    res.writeHead(200);
-    res.end('done');
-  });
-});
-
-
-server.listen(common.port, function() {
-  var form = new FormData();
-
-  var options = {
-    header:
-      CRLF + '--' + form.getBoundary() + CRLF +
-      testHeader +
-      CRLF + CRLF,
-
-    // override content-length,
-    // much lower than actual buffer size (1000)
-    knownLength: 1
-  };
-
-  var bufferData = [];
-  for (var z = 0; z < 1000; z++) {
-    bufferData.push(1);
-  }
-  var buffer = new Buffer(bufferData);
-
-  form.append('my_buffer', buffer, options);
-
-  // (available to req handler)
-  expectedLength = form._lastBoundary().length + form._overheadLength + options.knownLength;
-
-  form.submit('http://localhost:' + common.port + '/', function(err, res) {
-    if (err) {
-      throw err;
-    }
-
-    assert.strictEqual(res.statusCode, 200);
-    server.close();
-  });
-
-});
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-form-get-length.js b/node_modules/request/node_modules/form-data/test/integration/test-form-get-length.js
deleted file mode 100644
index 44d3b4dc27..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-form-get-length.js
+++ /dev/null
@@ -1,93 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var FormData = require(common.dir.lib + '/form_data');
-var fake = require('fake').create();
-var fs = require('fs');
-
-(function testEmptyForm() {
-  var form = new FormData();
-  var callback = fake.callback(arguments.callee.name + '-getLength');
-  var calls = fake.expectAnytime(callback, [null, 0]).calls;
-
-  form.getLength(callback);
-
-  // Make sure our response is async
-  assert.strictEqual(calls.length, 0);
-})();
-
-(function testUtf8String() {
-  var FIELD = 'my_field';
-  var VALUE = 'May the € be with you';
-
-  var form = new FormData();
-  form.append(FIELD, VALUE);
-  var callback = fake.callback(arguments.callee.name + '-getLength');
-
-  var expectedLength =
-    form._overheadLength +
-    Buffer.byteLength(VALUE) +
-    form._lastBoundary().length;
-
-  fake.expectAnytime(callback, [null, expectedLength]);
-  form.getLength(callback);
-})();
-
-(function testBuffer() {
-  var FIELD = 'my_field';
-  var VALUE = new Buffer(23);
-
-  var form = new FormData();
-  form.append(FIELD, VALUE);
-  var callback = fake.callback(arguments.callee.name + '-getLength');
-
-  var expectedLength =
-    form._overheadLength +
-    VALUE.length +
-    form._lastBoundary().length;
-
-  fake.expectAnytime(callback, [null, expectedLength]);
-  form.getLength(callback);
-})();
-
-
-(function testStringFileBufferFile() {
-  var fields = [
-    {
-      name: 'my_field',
-      value: 'Test 123',
-    },
-    {
-      name: 'my_image',
-      value: fs.createReadStream(common.dir.fixture + '/unicycle.jpg'),
-    },
-    {
-      name: 'my_buffer',
-      value: new Buffer('123'),
-    },
-    {
-      name: 'my_txt',
-      value: fs.createReadStream(common.dir.fixture + '/bacon.txt'),
-    },
-  ];
-
-  var form = new FormData();
-  var expectedLength = 0;
-
-  fields.forEach(function(field) {
-    form.append(field.name, field.value);
-    if (field.value.path) {
-      var stat = fs.statSync(field.value.path);
-      expectedLength += stat.size;
-    } else {
-      expectedLength += field.value.length;
-    }
-  });
-
-  expectedLength += form._overheadLength + form._lastBoundary().length;
-
-  var callback = fake.callback(arguments.callee.name + '-getLength');
-  fake.expectAnytime(callback, [null, expectedLength]);
-  form.getLength(callback);
-})();
-
-
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-get-boundary.js b/node_modules/request/node_modules/form-data/test/integration/test-get-boundary.js
deleted file mode 100644
index 6dc2fb2bdd..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-get-boundary.js
+++ /dev/null
@@ -1,18 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-
-var FormData = require(common.dir.lib + '/form_data');
-
-(function testOneBoundaryPerForm() {
-  var form = new FormData();
-  var boundary = form.getBoundary();
-
-  assert.equal(boundary, form.getBoundary());
-  assert.equal(boundary.length, 50);
-})();
-
-(function testUniqueBoundaryPerForm() {
-  var formA = new FormData();
-  var formB = new FormData();
-  assert.notEqual(formA.getBoundary(), formB.getBoundary());
-})();
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-http-response.js b/node_modules/request/node_modules/form-data/test/integration/test-http-response.js
deleted file mode 100644
index bebb26b35f..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-http-response.js
+++ /dev/null
@@ -1,83 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var http = require('http');
-var path = require('path');
-var mime = require('mime');
-var request = require('request');
-var parseUrl = require('url').parse;
-var fs = require('fs');
-var FormData = require(common.dir.lib + '/form_data');
-var IncomingForm = require('formidable').IncomingForm;
-
-var remoteFile = 'http://nodejs.org/images/logo.png';
-
-var FIELDS;
-var server;
-
-var parsedUrl = parseUrl(remoteFile)
-  , options = {
-      method: 'get',
-      port: parsedUrl.port || 80,
-      path: parsedUrl.pathname,
-      host: parsedUrl.hostname
-    }
-  ;
-
-http.request(options, function(res) {
-
-  FIELDS = [
-    {name: 'my_field', value: 'my_value'},
-    {name: 'my_buffer', value: new Buffer([1, 2, 3])},
-    {name: 'remote_file', value: res }
-  ];
-
-  var form = new FormData();
-  FIELDS.forEach(function(field) {
-    form.append(field.name, field.value);
-  });
-
-  server.listen(common.port, function() {
-
-    form.submit('http://localhost:' + common.port + '/', function(err, res) {
-
-      if (err) {
-        throw err;
-      }
-
-      assert.strictEqual(res.statusCode, 200);
-      server.close();
-    });
-
-  });
-
-}).end();
-
-server = http.createServer(function(req, res) {
-
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  form
-    .on('field', function(name, value) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(value, field.value+'');
-    })
-    .on('file', function(name, file) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      // http response doesn't have path property
-      assert.strictEqual(file.name, path.basename(field.value.path || remoteFile));
-      assert.strictEqual(file.type, mime.lookup(file.name));
-    })
-    .on('end', function() {
-      res.writeHead(200);
-      res.end('done');
-    });
-});
-
-
-process.on('exit', function() {
-  assert.strictEqual(FIELDS.length, 0);
-});
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-pipe.js b/node_modules/request/node_modules/form-data/test/integration/test-pipe.js
deleted file mode 100644
index a9264f92eb..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-pipe.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var http = require('http');
-var path = require('path');
-var mime = require('mime');
-var request = require('request');
-var fs = require('fs');
-var FormData = require(common.dir.lib + '/form_data');
-var IncomingForm = require('formidable').IncomingForm;
-
-var remoteFile = 'http://nodejs.org/images/logo.png';
-
-// wrap non simple values into function
-// just to deal with ReadStream "autostart"
-// Can't wait for 0.10
-var FIELDS = [
-  {name: 'my_field', value: 'my_value'},
-  {name: 'my_buffer', value: function(){ return new Buffer([1, 2, 3])} },
-  {name: 'my_file', value: function(){ return fs.createReadStream(common.dir.fixture + '/unicycle.jpg')} },
-  {name: 'remote_file', value: function(){ return request(remoteFile)} }
-];
-
-var server = http.createServer(function(req, res) {
-
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  form
-    .on('field', function(name, value) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(value, field.value+'');
-    })
-    .on('file', function(name, file) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(file.name, path.basename(field.value.path));
-      assert.strictEqual(file.type, mime.lookup(file.name));
-    })
-    .on('end', function() {
-      res.writeHead(200);
-      res.end('done');
-    });
-});
-
-server.listen(common.port, function() {
-  var form = new FormData();
-  FIELDS.forEach(function(field) {
-    // important to append ReadStreams within the same tick
-    if ((typeof field.value == 'function')) {
-      field.value = field.value();
-    }
-    form.append(field.name, field.value);
-  });
-
-  var request = http.request({
-    method: 'post',
-    port: common.port,
-    path: '/upload',
-    headers: form.getHeaders()
-  });
-
-  form.pipe(request);
-
-  request.on('response', function(res) {
-    server.close();
-  });
-});
-
-process.on('exit', function() {
-  assert.strictEqual(FIELDS.length, 0);
-});
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-submit-custom.js b/node_modules/request/node_modules/form-data/test/integration/test-submit-custom.js
deleted file mode 100644
index f0d8f088cd..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-submit-custom.js
+++ /dev/null
@@ -1,77 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var http = require('http');
-var path = require('path');
-var mime = require('mime');
-var request = require('request');
-var fs = require('fs');
-var FormData = require(common.dir.lib + '/form_data');
-var IncomingForm = require('formidable').IncomingForm;
-
-var remoteFile = 'http://nodejs.org/images/logo.png';
-
-// wrap non simple values into function
-// just to deal with ReadStream "autostart"
-// Can't wait for 0.10
-var FIELDS = [
-  {name: 'my_field', value: 'my_value'},
-  {name: 'my_buffer', value: function(){ return new Buffer([1, 2, 3])} },
-  {name: 'my_file', value: function(){ return fs.createReadStream(common.dir.fixture + '/unicycle.jpg')} },
-  {name: 'remote_file', value: function(){ return request(remoteFile)} }
-];
-
-var server = http.createServer(function(req, res) {
-
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  form
-    .on('field', function(name, value) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(value, field.value+'');
-    })
-    .on('file', function(name, file) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(file.name, path.basename(field.value.path));
-      assert.strictEqual(file.type, mime.lookup(file.name));
-    })
-    .on('end', function() {
-      res.writeHead(200);
-      res.end('done');
-    });
-});
-
-server.listen(common.port, function() {
-
-  var form = new FormData();
-
-  FIELDS.forEach(function(field) {
-    // important to append ReadStreams within the same tick
-    if ((typeof field.value == 'function')) {
-      field.value = field.value();
-    }
-    form.append(field.name, field.value);
-  });
-
-  // custom params object passed to submit
-  form.submit({
-    port: common.port,
-    path: '/'
-  }, function(err, res) {
-
-    if (err) {
-      throw err;
-    }
-
-    assert.strictEqual(res.statusCode, 200);
-    server.close();
-  });
-
-});
-
-process.on('exit', function() {
-  assert.strictEqual(FIELDS.length, 0);
-});
diff --git a/node_modules/request/node_modules/form-data/test/integration/test-submit.js b/node_modules/request/node_modules/form-data/test/integration/test-submit.js
deleted file mode 100644
index f90cc7f285..0000000000
--- a/node_modules/request/node_modules/form-data/test/integration/test-submit.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var common = require('../common');
-var assert = common.assert;
-var http = require('http');
-var path = require('path');
-var mime = require('mime');
-var request = require('request');
-var fs = require('fs');
-var FormData = require(common.dir.lib + '/form_data');
-var IncomingForm = require('formidable').IncomingForm;
-
-var remoteFile = 'http://nodejs.org/images/logo.png';
-
-// wrap non simple values into function
-// just to deal with ReadStream "autostart"
-// Can't wait for 0.10
-var FIELDS = [
-  {name: 'my_field', value: 'my_value'},
-  {name: 'my_buffer', value: function(){ return new Buffer([1, 2, 3])} },
-  {name: 'my_file', value: function(){ return fs.createReadStream(common.dir.fixture + '/unicycle.jpg')} },
-  {name: 'remote_file', value: function(){ return request(remoteFile)} }
-];
-
-var server = http.createServer(function(req, res) {
-
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  form
-    .on('field', function(name, value) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(value, field.value+'');
-    })
-    .on('file', function(name, file) {
-      var field = FIELDS.shift();
-      assert.strictEqual(name, field.name);
-      assert.strictEqual(file.name, path.basename(field.value.path));
-      assert.strictEqual(file.type, mime.lookup(file.name));
-    })
-    .on('end', function() {
-      res.writeHead(200);
-      res.end('done');
-    });
-});
-
-server.listen(common.port, function() {
-
-  var form = new FormData();
-
-  FIELDS.forEach(function(field) {
-    // important to append ReadStreams within the same tick
-    if ((typeof field.value == 'function')) {
-      field.value = field.value();
-    }
-    form.append(field.name, field.value);
-  });
-
-  form.submit('http://localhost:' + common.port + '/', function(err, res) {
-
-    if (err) {
-      throw err;
-    }
-
-    assert.strictEqual(res.statusCode, 200);
-    server.close();
-  });
-
-});
-
-process.on('exit', function() {
-  assert.strictEqual(FIELDS.length, 0);
-});
diff --git a/node_modules/request/node_modules/form-data/test/run.js b/node_modules/request/node_modules/form-data/test/run.js
deleted file mode 100755
index 0bb8e82241..0000000000
--- a/node_modules/request/node_modules/form-data/test/run.js
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-var far = require('far').create();
-
-far.add(__dirname);
-far.include(/test-.*\.js$/);
-
-far.execute();
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/escaper.js b/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/escaper.js
deleted file mode 100644
index 4dddd77dc9..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/escaper.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    describe('#escapeJavaScript', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('<script>alert(1)</script>');
-            expect(encoded).to.equal('\\x3cscript\\x3ealert\\x281\\x29\\x3c\\x2fscript\\x3e');
-            done();
-        });
-
-        it('encodes \' characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('something(\'param\')');
-            expect(encoded).to.equal('something\\x28\\x27param\\x27\\x29');
-            done();
-        });
-
-        it('encodes large unicode characters with the correct padding', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('\\u0500\\u1000');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script>alert(1)</script>');
-            expect(encoded).to.equal('&lt;script&gt;alert&#x28;1&#x29;&lt;&#x2f;script&gt;');
-            done();
-        });
-
-        it('encodes < and > as named characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script><>');
-            expect(encoded).to.equal('&lt;script&gt;&lt;&gt;');
-            done();
-        });
-
-        it('encodes large unicode characters', function (done) {
-
-            var encoded = Hoek.escapeHtml(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('&#500;&#1000;');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeHtml(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/index.js b/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/index.js
deleted file mode 100755
index c40e3ad9a4..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/index.js
+++ /dev/null
@@ -1,1078 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    var nestedObj = {
-        v: [7,8,9],
-        w: /^something$/igm,
-        x: {
-            a: [1, 2, 3],
-            b: 123456,
-            c: new Date(),
-            d: /hi/igm,
-            e: /hello/
-        },
-        y: 'y',
-        z: new Date()
-    };
-
-    var dupsArray = [nestedObj, { z: 'z' }, nestedObj];
-    var reducedDupsArray = [nestedObj, { z: 'z' }];
-
-    describe('#clone', function () {
-
-        it('should clone a nested object', function (done) {
-
-            var a = nestedObj;
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.z.getTime()).to.equal(b.z.getTime());
-            done();
-        });
-
-        it('should clone a null object', function (done) {
-
-            var b = Hoek.clone(null);
-
-            expect(b).to.equal(null);
-            done();
-        });
-
-        it('should not convert undefined properties to null', function (done) {
-
-            var obj = { something: undefined };
-            var b = Hoek.clone(obj);
-
-            expect(typeof b.something).to.equal('undefined');
-            done();
-        });
-
-        it('should not throw on circular reference', function (done) {
-
-            var a = {};
-            a.x = a;
-
-            var test = (function () {
-
-                var b = Hoek.clone(a);
-            });
-
-            expect(test).to.not.throw();
-            done();
-        });
-
-        it('should properly clone circular reference', function (done) {
-
-            var x = {
-                'z': new Date()
-            };
-            x.y = x;
-
-            var b = Hoek.clone(x);
-            expect(Object.keys(b.y)).to.deep.equal(Object.keys(x))
-            expect(b.z).to.not.equal(x.z);
-            expect(b.y).to.not.equal(x.y);
-            expect(b.y.z).to.not.equal(x.y.z);
-            expect(b.y).to.equal(b);
-            expect(b.y.y.y.y).to.equal(b);
-            done();
-        });
-
-        it('should properly clone deeply nested object', function (done) {
-
-            var a = {
-                x: {
-                    y: {
-                        a: [1, 2, 3],
-                        b: 123456,
-                        c: new Date(),
-                        d: /hi/igm,
-                        e: /hello/
-                    },
-                }
-            };
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.x.y.c.getTime()).to.equal(b.x.y.c.getTime());
-            done();
-        });
-
-        it('should properly clone arrays', function (done) {
-
-            var a = [1,2,3];
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            done();
-        });
-
-        it('should perform actual copy for shallow keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            // Date
-            expect(x.z).to.not.equal(nestedObj.z);
-            expect(x.z).to.not.equal(y.z);
-
-            // Regex
-            expect(x.w).to.not.equal(nestedObj.w);
-            expect(x.w).to.not.equal(y.w);
-
-            // Array
-            expect(x.v).to.not.equal(nestedObj.v);
-            expect(x.v).to.not.equal(y.v);
-
-            // Immutable(s)
-            x.y = 5;
-            expect(x.y).to.not.equal(nestedObj.y);
-            expect(x.y).to.not.equal(y.y);
-
-            done();
-        });
-
-        it('should perform actual copy for deep keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            expect(x.x.c).to.not.equal(nestedObj.x.c);
-            expect(x.x.c).to.not.equal(y.x.c);
-
-            expect(x.x.c.getTime()).to.equal(nestedObj.x.c.getTime());
-            expect(x.x.c.getTime()).to.equal(y.x.c.getTime());
-            done();
-        });
-
-        it('copies functions with properties', function (done) {
-
-            var a = {
-                x: function () { return 1; },
-                y: {}
-            };
-            a.x.z = 'string in function';
-            a.x.v = function () { return 2; };
-            a.y.u = a.x;
-
-            var b = Hoek.clone(a);
-            expect(b.x()).to.equal(1);
-            expect(b.x.v()).to.equal(2);
-            expect(b.y.u).to.equal(b.x);
-            expect(b.x.z).to.equal('string in function');
-            done();
-        });
-
-        it('should copy a buffer', function(done){
-            var tls = {
-                key: new Buffer([1,2,3,4,5]),
-                cert: new Buffer([1,2,3,4,5,6,10])
-            }
-
-            copiedTls = Hoek.clone(tls);
-            expect(Buffer.isBuffer(copiedTls.key)).to.equal(true);
-            expect(JSON.stringify(copiedTls.key)).to.equal(JSON.stringify(tls.key))
-            expect(Buffer.isBuffer(copiedTls.cert)).to.equal(true);
-            expect(JSON.stringify(copiedTls.cert)).to.equal(JSON.stringify(tls.cert))
-            done();
-        });
-    });
-
-    describe('#merge', function () {
-
-        it('does not throw if source is null', function (done) {
-
-            var a = {};
-            var b = null;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('does not throw if source is undefined', function (done) {
-
-            var a = {};
-            var b = undefined;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('throws if source is not an object', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = 0;
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid source value: must be null, undefined, or an object');
-            done();
-        });
-
-        it('throws if target is not an object', function (done) {
-
-            expect(function () {
-
-                var a = 0;
-                var b = {};
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid target value: must be an object');
-            done();
-        });
-
-        it('throws if target is not an array and source is', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = [1, 2];
-
-                Hoek.merge(a, b);
-            }).to.throw('Cannot merge array onto an object');
-            done();
-        });
-
-        it('returns the same object when merging arrays', function (done) {
-
-            var a = [];
-            var b = [1, 2];
-
-            expect(Hoek.merge(a, b)).to.equal(a);
-            done();
-        });
-
-        it('should combine an empty object with a non-empty object', function (done) {
-
-            var a = {};
-            var b = nestedObj;
-
-            var c = Hoek.merge(a, b);
-            expect(a).to.deep.equal(b);
-            expect(c).to.deep.equal(b);
-            done();
-        });
-
-        it('should override values in target', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var c = Hoek.merge(a, b);
-            expect(c.x).to.equal(null);
-            expect(c.y).to.equal(2);
-            expect(c.z).to.equal(4);
-            expect(c.v).to.equal(0);
-            expect(c.m).to.equal('123');
-            expect(c.t).to.deep.equal({ u: 6 });
-            done();
-        });
-
-        it('should override values in target (flip)', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var d = Hoek.merge(b, a);
-            expect(d.x).to.equal(1);
-            expect(d.y).to.equal(2);
-            expect(d.z).to.equal(3);
-            expect(d.v).to.equal(5);
-            expect(d.m).to.equal('abc');
-            expect(d.t).to.deep.equal('test');
-            done();
-        });
-    });
-
-    describe('#applyToDefaults', function () {
-
-        var defaults = {
-            a: 1,
-            b: 2,
-            c: {
-                d: 3,
-                e: [5, 6]
-            },
-            f: 6,
-            g: 'test'
-        };
-
-        it('should return null if options is false', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, false);
-            expect(result).to.equal(null);
-            done();
-        });
-
-        it('should return a copy of defaults if options is true', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, true);
-            expect(result).to.deep.equal(result);
-            done();
-        });
-
-        it('should apply object to defaults', function (done) {
-
-            var obj = {
-                a: null,
-                c: {
-                    e: [4]
-                },
-                f: 0,
-                g: {
-                    h: 5
-                }
-            };
-
-            var result = Hoek.applyToDefaults(defaults, obj);
-            expect(result.c.e).to.deep.equal([4]);
-            expect(result.a).to.equal(1);
-            expect(result.b).to.equal(2);
-            expect(result.f).to.equal(0);
-            expect(result.g).to.deep.equal({ h: 5 });
-            done();
-        });
-    });
-
-    describe('#unique', function () {
-
-        it('should ensure uniqueness within array of objects based on subkey', function (done) {
-
-            var a = Hoek.unique(dupsArray, 'x');
-            expect(a).to.deep.equal(reducedDupsArray);
-            done();
-        });
-
-        it('removes duplicated without key', function (done) {
-
-            expect(Hoek.unique([1, 2, 3, 4, 2, 1, 5])).to.deep.equal([1, 2, 3, 4, 5]);
-            done();
-        });
-    });
-
-    describe('#mapToObject', function () {
-
-        it('should return null on null array', function (done) {
-
-            var a = Hoek.mapToObject(null);
-            expect(a).to.equal(null);
-            done();
-        });
-
-        it('should convert basic array to existential object', function (done) {
-
-            var keys = [1, 2, 3, 4];
-            var a = Hoek.mapToObject(keys);
-            for (var i in keys) {
-                expect(a[keys[i]]).to.equal(true);
-            }
-            done();
-        });
-
-        it('should convert array of objects to existential object', function (done) {
-
-            var keys = [{ x: 1 }, { x: 2 }, { x: 3 }];
-            var subkey = 'x';
-            var a = Hoek.mapToObject(keys, subkey);
-            for (var i in keys) {
-                expect(a[keys[i][subkey]]).to.equal(true);
-            }
-            done();
-        });
-    });
-
-    describe('#intersect', function () {
-
-        it('should return the common objects of two arrays', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(array1, array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-
-        it('should return just the first common object of two arrays', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(array1, array2, true);
-            expect(common).to.equal(5);
-            done();
-        });
-
-        it('should return an empty array if either input is null', function (done) {
-
-            expect(Hoek.intersect([1], null).length).to.equal(0);
-            expect(Hoek.intersect(null, [1]).length).to.equal(0);
-            done();
-        });
-
-        it('should return the common objects of object and array', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(Hoek.mapToObject(array1), array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-    });
-
-    describe('#matchKeys', function () {
-
-        it('should match the existing object keys', function (done) {
-
-            var obj = {
-                a: 1,
-                b: 2,
-                c: 3,
-                d: null
-            };
-
-            expect(Hoek.matchKeys(obj, ['b', 'c', 'd', 'e'])).to.deep.equal(['b', 'c', 'd']);
-            done();
-        });
-    });
-
-    describe('#flatten', function () {
-
-        it('should return a flat array', function (done) {
-
-            var result = Hoek.flatten([1, 2, [3, 4, [5, 6], [7], 8], [9], [10, [11, 12]], 13]);
-            expect(result.length).to.equal(13);
-            expect(result).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-            done();
-        });
-    });
-
-    describe('#removeKeys', function () {
-
-        var objWithHiddenKeys = {
-            location: {
-                name: 'San Bruno'
-            },
-            company: {
-                name: '@WalmartLabs'
-            }
-        };
-
-        it('should delete params with definition\'s hide set to true', function (done) {
-
-            var a = Hoek.removeKeys(objWithHiddenKeys, ['location']);
-            expect(objWithHiddenKeys.location).to.not.exist;
-            expect(objWithHiddenKeys.company).to.exist;
-            done();
-        });
-    });
-
-    describe('#reach', function () {
-
-        var obj = {
-            a: {
-                b: {
-                    c: {
-                        d: 1,
-                        e: 2
-                    },
-                    f: 'hello'
-                },
-                g: {
-                    h: 3
-                }
-            },
-            i: function () { }
-        };
-
-        it('returns a valid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d')).to.equal(1);
-            done();
-        });
-
-        it('returns null on null object', function (done) {
-
-            expect(Hoek.reach(null, 'a.b.c.d')).to.not.exist;
-            done();
-        });
-
-        it('returns null on missing member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d.x')).to.not.exist;
-            done();
-        });
-
-        it('returns null on invalid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d-.x')).to.not.exist;
-            done();
-        });
-
-        it('returns function member', function (done) {
-
-            expect(typeof Hoek.reach(obj, 'i')).to.equal('function');
-            done();
-        });
-    });
-
-    describe('#inheritAsync', function () {
-
-        it('should inherit selected methods and wrap in async call', function (done) {
-
-            var proto = {
-                a: function () {
-                    return 'a!';
-                },
-                b: function () {
-                    return 'b!';
-                },
-                c: function () {
-                    throw new Error('c!');
-                }
-            };
-
-            var targetFunc = function () { };
-            targetFunc.prototype.c = function () {
-
-                return 'oops';
-            };
-
-            Hoek.inheritAsync(targetFunc, proto, ['a', 'c']);
-            var target = new targetFunc();
-
-            expect(typeof target.a).to.equal('function');
-            expect(typeof target.c).to.equal('function');
-            expect(target.b).to.not.exist;
-
-            target.a(function (err, result) {
-
-                expect(err).to.not.exist;
-                expect(result).to.equal('a!');
-
-                target.c(function (err, result) {
-
-                    expect(result).to.not.exist;
-                    expect(err.message).to.equal('c!');
-                    done();
-                });
-            });
-        });
-    });
-
-    describe('#callStack', function () {
-
-        it('should return the full call stack', function (done) {
-
-            var stack = Hoek.callStack();
-            expect(stack[0][0]).to.contain('index.js');
-            expect(stack[0][2]).to.equal(30);
-            done();
-        });
-    });
-
-    describe('#displayStack ', function () {
-
-        it('should return the full call stack for display', function (done) {
-
-            var stack = Hoek.displayStack();
-            expect(stack[0]).to.contain('test/index.js:');
-            done();
-        });
-
-        it('should include constructor functions correctly', function (done) {
-
-            var Something = function (next) {
-
-                next();
-            };
-
-            var something = new Something(function () {
-
-                var stack = Hoek.displayStack();
-                expect(stack[1]).to.contain('new Something');
-                done();
-            });
-        });
-    });
-
-    describe('#abort', function () {
-
-        it('should exit process when not in test mode', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-
-            process.env.NODE_ENV = 'nottatest';
-            process.stdout.write = function () { };
-            process.exit = function (state) {
-
-                process.exit = exit;
-                process.env.NODE_ENV = env;
-                process.stdout.write = write;
-
-                expect(state).to.equal(1);
-                done();
-            };
-
-            Hoek.abort('Boom');
-        });
-
-        it('should throw when not in test mode and abortThrow is true', function (done) {
-
-            var env = process.env.NODE_ENV;
-            process.env.NODE_ENV = 'nottatest';
-            Hoek.abortThrow = true;
-
-            var fn = function () {
-
-                Hoek.abort('my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            Hoek.abortThrow = false;
-            process.env.NODE_ENV = env;
-
-            done();
-        });
-
-
-        it('should respect hideStack argument', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message', true);
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.equal('ABORT: my error message\n\t\n');
-
-            done();
-        });
-
-        it('should default to showing stack', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message');
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.contain('index.js');
-
-            done();
-        });
-    });
-
-    describe('#assert', function () {
-
-        it('should throw an Error when using assert in a test', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with no message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false);
-            };
-
-            expect(fn).to.throw('Unknown error');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with multipart message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', 'my message');
-            };
-
-            expect(fn).to.throw('This is my message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', { spinal: 'tap' });
-            };
-
-            expect(fn).to.throw('This is {"spinal":"tap"}');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with error object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, new Error('This is spinal tap'));
-            };
-
-            expect(fn).to.throw('This is spinal tap');
-            done();
-        });
-    });
-
-    describe('#loadDirModules', function () {
-
-        it('should load modules from directory', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], target);
-            expect(target.Test1.x).to.equal(1);
-            expect(target.Test2).to.not.exist;
-            expect(target.Test3.z).to.equal(3);
-            done();
-        });
-
-        it('should list modules from directory into function', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], function (path, name, capName) {
-
-                target[name] = capName;
-            });
-
-            expect(target.test1).to.equal('Test1');
-            expect(target.test2).to.not.exist;
-            expect(target.test3).to.equal('Test3');
-            done();
-        });
-    });
-
-    describe('#rename', function () {
-
-        it('should rename object key', function (done) {
-
-            var a = { b: 'c' };
-            Hoek.rename(a, 'b', 'x');
-            expect(a.b).to.not.exist;
-            expect(a.x).to.equal('c');
-            done();
-        });
-    });
-
-    describe('Timer', function () {
-
-        it('should return time elapsed', function (done) {
-
-            var timer = new Hoek.Timer();
-            setTimeout(function () {
-
-                expect(timer.elapsed()).to.be.above(9);
-                done();
-            }, 12);
-        });
-    });
-
-    describe('#loadPackage', function () {
-
-        it('should', function (done) {
-
-            var pack = Hoek.loadPackage();
-            expect(pack.name).to.equal('hoek');
-            done();
-        });
-    });
-
-    describe('#escapeRegex', function () {
-
-        it('should escape all special regular expression characters', function (done) {
-
-            var a = Hoek.escapeRegex('4^f$s.4*5+-_?%=#!:@|~\\/`"(>)[<]d{}s,');
-            expect(a).to.equal('4\\^f\\$s\\.4\\*5\\+\\-_\\?%\\=#\\!\\:@\\|~\\\\\\/`"\\(>\\)\\[<\\]d\\{\\}s\\,');
-            done();
-        });
-    });
-
-    describe('#toss', function () {
-
-        it('should call callback with new error', function (done) {
-
-            var callback = function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('bug');
-                done();
-            };
-
-            Hoek.toss(true, 'feature', callback);
-            Hoek.toss(false, 'bug', callback);
-        });
-
-        it('should call callback with new error and no message', function (done) {
-
-            Hoek.toss(false, function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('');
-                done();
-            });
-        });
-
-        it('should call callback with error condition', function (done) {
-
-            Hoek.toss(new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using message with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), 'boom', function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using passed error with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-    });
-
-    describe('Base64Url', function () {
-
-        var base64str = 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w';
-        var str = unescape('%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20%21%22%23%24%25%26%27%28%29*+%2C-./0123456789%3A%3B%3C%3D%3E%3F@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D%7E%7F%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF');
-
-        describe('#base64urlEncode', function () {
-
-            it('should base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlEncode(str)).to.equal(base64str);
-                done();
-            });
-        });
-
-        describe('#base64urlDecode', function () {
-
-            it('should un-base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlDecode(base64str)).to.equal(str);
-                done();
-            });
-
-            it('should return error on undefined input', function (done) {
-
-                expect(Hoek.base64urlDecode().message).to.exist;
-                done();
-            });
-
-            it('should return error on invalid input', function (done) {
-
-                expect(Hoek.base64urlDecode('*').message).to.exist;
-                done();
-            });
-        });
-    });
-
-    describe('#escapeHeaderAttribute', function () {
-
-        it('should not alter ascii values', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('My Value');
-            expect(a).to.equal('My Value');
-            done();
-        });
-
-        it('should escape all special HTTP header attribute characters', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('I said go!!!#"' + String.fromCharCode(92));
-            expect(a).to.equal('I said go!!!#\\"\\\\');
-            done();
-        });
-
-        it('should throw on large unicode characters', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test' + String.fromCharCode(500) + String.fromCharCode(300));
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-
-        it('should throw on CRLF to prevent response splitting', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test\r\n');
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('should escape all special HTML characters', function (done) {
-
-            var a = Hoek.escapeHtml('&<>"\'`');
-            expect(a).to.equal('&amp;&lt;&gt;&quot;&#x27;&#x60;');
-            done();
-        });
-
-        it('should return empty string on falsy input', function (done) {
-
-            var a = Hoek.escapeHtml('');
-            expect(a).to.equal('');
-            done();
-        });
-
-        it('should return unchanged string on no reserved input', function (done) {
-
-            var a = Hoek.escapeHtml('abc');
-            expect(a).to.equal('abc');
-            done();
-        });
-    });
-
-    describe('#printEvent', function () {
-
-        it('outputs event as string', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, {"some":"data"}');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-
-        it('outputs JSON error', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            event.data.a = event.data;
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, JSON Error: Converting circular structure to JSON');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-    });
-
-    describe('#nextTick', function () {
-
-        it('calls the provided callback on nextTick', function (done) {
-
-            var a = 0;
-
-            var inc = function (step, next) {
-
-                a += step;
-                next();
-            };
-
-            var ticked = Hoek.nextTick(inc);
-
-            ticked(5, function () {
-
-                expect(a).to.equal(6);
-                done();
-            });
-
-            expect(a).to.equal(0);
-            inc(1, function () {
-
-                expect(a).to.equal(1);
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test1.js b/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test1.js
deleted file mode 100755
index 3f41e601e5..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test1.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.x = 1;
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test2.js b/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test2.js
deleted file mode 100755
index 38556b274d..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test2.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.y = 2;
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test3.js b/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test3.js
deleted file mode 100755
index 436b860b80..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/node_modules/hoek/test/modules/test3.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.z = 3;
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js b/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
deleted file mode 100755
index a20c1c345a..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
+++ /dev/null
@@ -1,245 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Boom = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Boom', function () {
-
-    it('returns an error with info when constructed using another error', function (done) {
-
-        var error = new Error('ka-boom');
-        error.xyz = 123;
-        var err = new Boom(error);
-        expect(err.data.xyz).to.equal(123);
-        expect(err.message).to.equal('ka-boom');
-        expect(err.response).to.deep.equal({
-            code: 500,
-            payload: {
-                code: 500,
-                error: 'Internal Server Error',
-                message: 'ka-boom'
-            },
-            headers: {}
-        });
-        done();
-    });
-
-    describe('#isBoom', function () {
-
-        it('returns true for Boom object', function (done) {
-
-            expect(Boom.badRequest().isBoom).to.equal(true);
-            done();
-        });
-
-        it('returns false for Error object', function (done) {
-
-            expect(new Error().isBoom).to.not.exist;
-            done();
-        });
-    });
-
-    describe('#badRequest', function () {
-
-        it('returns a 400 error code', function (done) {
-
-            expect(Boom.badRequest().response.code).to.equal(400);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.badRequest('my message').message).to.equal('my message');
-            done();
-        });
-    });
-
-    describe('#unauthorized', function () {
-
-        it('returns a 401 error code', function (done) {
-
-            var err = Boom.unauthorized();
-            expect(err.response.code).to.equal(401);
-            expect(err.response.headers).to.deep.equal({});
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.unauthorized('my message').message).to.equal('my message');
-            done();
-        });
-
-        it('returns a WWW-Authenticate header when passed a scheme', function (done) {
-
-            var err = Boom.unauthorized('boom', 'Test');
-            expect(err.response.code).to.equal(401);
-            expect(err.response.headers['WWW-Authenticate']).to.equal('Test error="boom"');
-            done();
-        });
-
-        it('returns a WWW-Authenticate header when passed a scheme and attributes', function (done) {
-
-            var err = Boom.unauthorized('boom', 'Test', { a: 1, b: 'something', c: null, d: 0 });
-            expect(err.response.code).to.equal(401);
-            expect(err.response.headers['WWW-Authenticate']).to.equal('Test a="1", b="something", c="", d="0", error="boom"');
-            done();
-        });
-
-        it('sets the isMissing flag when error message is empty', function (done) {
-
-            var err = Boom.unauthorized('', 'Basic');
-            expect(err.isMissing).to.equal(true);
-            done();
-        });
-
-        it('does not set the isMissing flag when error message is not empty', function (done) {
-
-            var err = Boom.unauthorized('message', 'Basic');
-            expect(err.isMissing).to.equal(undefined);
-            done();
-        });
-
-        it('sets a WWW-Authenticate when passed as an array', function (done) {
-
-            var err = Boom.unauthorized('message', ['Basic', 'Example e="1"', 'Another x="3", y="4"']);
-            expect(err.response.headers['WWW-Authenticate']).to.equal('Basic, Example e="1", Another x="3", y="4"');
-            done();
-        });
-    });
-
-    describe('#clientTimeout', function () {
-
-        it('returns a 408 error code', function (done) {
-
-            expect(Boom.clientTimeout().response.code).to.equal(408);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.clientTimeout('my message').message).to.equal('my message');
-            done();
-        });
-    });
-
-    describe('#serverTimeout', function () {
-
-        it('returns a 503 error code', function (done) {
-
-            expect(Boom.serverTimeout().response.code).to.equal(503);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.serverTimeout('my message').message).to.equal('my message');
-            done();
-        });
-    });
-
-    describe('#forbidden', function () {
-
-        it('returns a 403 error code', function (done) {
-
-            expect(Boom.forbidden().response.code).to.equal(403);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.forbidden('my message').message).to.equal('my message');
-            done();
-        });
-    });
-
-    describe('#notFound', function () {
-
-        it('returns a 404 error code', function (done) {
-
-            expect(Boom.notFound().response.code).to.equal(404);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            expect(Boom.notFound('my message').message).to.equal('my message');
-            done();
-        });
-    });
-
-    describe('#internal', function () {
-
-        it('returns a 500 error code', function (done) {
-
-            expect(Boom.internal().response.code).to.equal(500);
-            done();
-        });
-
-        it('sets the message with the passed in message', function (done) {
-
-            var err = Boom.internal('my message');
-            expect(err.message).to.equal('my message');
-            expect(err.response.payload.message).to.equal('An internal server error occurred');
-            done();
-        });
-
-        it('passes data on the callback if its passed in', function (done) {
-
-            expect(Boom.internal('my message', { my: 'data' }).data.my).to.equal('data');
-            done();
-        });
-
-        it('uses passed in stack if its available', function (done) {
-
-            var error = new Error();
-            error.stack = 'my stack line\nmy second stack line';
-            expect(Boom.internal('my message', error).trace[0]).to.equal('my stack line');
-            done();
-        });
-    });
-
-    describe('#passThrough', function () {
-
-        it('returns a pass-through error', function (done) {
-
-            var err = Boom.passThrough(499, { a: 1 }, 'application/text', { 'X-Test': 'Boom' });
-            expect(err.response.code).to.equal(499);
-            expect(err.message).to.equal('Pass-through');
-            expect(err.response).to.deep.equal({
-                code: 499,
-                payload: { a: 1 },
-                headers: { 'X-Test': 'Boom' },
-                type: 'application/text'
-            });
-            done();
-        });
-    });
-
-    describe('#reformat', function () {
-
-        it('encodes any HTML markup in the response payload', function (done) {
-
-            var boom = new Boom(new Error('<script>alert(1)</script>'));
-            expect(boom.response.payload.message).to.not.contain('<script>');
-            done();
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js b/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
deleted file mode 100755
index 0d6b73c89a..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Cryptiles = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Cryptiles', function () {
-
-    describe('#randomString', function () {
-
-        it('should generate the right length string', function (done) {
-
-            for (var i = 1; i <= 1000; ++i) {
-                expect(Cryptiles.randomString(i).length).to.equal(i);
-            }
-
-            done();
-        });
-
-        it('returns an error on invalid bits size', function (done) {
-
-            expect(Cryptiles.randomString(99999999999999999999).message).to.equal('Failed generating random bits: Argument #1 must be number > 0');
-            done();
-        });
-    });
-
-    describe('#randomBits', function () {
-
-        it('returns an error on invalid input', function (done) {
-
-            expect(Cryptiles.randomBits(0).message).to.equal('Invalid random bits count');
-            done();
-        });
-    });
-
-    describe('#fixedTimeComparison', function () {
-
-        var a = Cryptiles.randomString(50000);
-        var b = Cryptiles.randomString(150000);
-
-        it('should take the same amount of time comparing different string sizes', function (done) {
-
-            var now = Date.now();
-            Cryptiles.fixedTimeComparison(b, a);
-            var t1 = Date.now() - now;
-
-            now = Date.now();
-            Cryptiles.fixedTimeComparison(b, b);
-            var t2 = Date.now() - now;
-
-            expect(t2 - t1).to.be.within(-20, 20);
-            done();
-        });
-
-        it('should return true for equal strings', function (done) {
-
-            expect(Cryptiles.fixedTimeComparison(a, a)).to.equal(true);
-            done();
-        });
-
-        it('should return false for different strings (size, a < b)', function (done) {
-
-            expect(Cryptiles.fixedTimeComparison(a, a + 'x')).to.equal(false);
-            done();
-        });
-
-        it('should return false for different strings (size, a > b)', function (done) {
-
-            expect(Cryptiles.fixedTimeComparison(a + 'x', a)).to.equal(false);
-            done();
-        });
-
-        it('should return false for different strings (size, a = b)', function (done) {
-
-            expect(Cryptiles.fixedTimeComparison(a + 'x', a + 'y')).to.equal(false);
-            done();
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js b/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js
deleted file mode 100644
index 4d1d67ac77..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/test/escaper.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    describe('#escapeJavaScript', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('<script>alert(1)</script>');
-            expect(encoded).to.equal('\\x3cscript\\x3ealert\\x281\\x29\\x3c\\x2fscript\\x3e');
-            done();
-        });
-
-        it('encodes \' characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('something(\'param\')');
-            expect(encoded).to.equal('something\\x28\\x27param\\x27\\x29');
-            done();
-        });
-
-        it('encodes large unicode characters with the correct padding', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('\\u0500\\u1000');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script>alert(1)</script>');
-            expect(encoded).to.equal('&lt;script&gt;alert&#x28;1&#x29;&lt;&#x2f;script&gt;');
-            done();
-        });
-
-        it('encodes < and > as named characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script><>');
-            expect(encoded).to.equal('&lt;script&gt;&lt;&gt;');
-            done();
-        });
-
-        it('encodes large unicode characters', function (done) {
-
-            var encoded = Hoek.escapeHtml(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('&#500;&#1000;');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeHtml(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js b/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
deleted file mode 100755
index cd93e7657f..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
+++ /dev/null
@@ -1,1069 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    var nestedObj = {
-        v: [7,8,9],
-        w: /^something$/igm,
-        x: {
-            a: [1, 2, 3],
-            b: 123456,
-            c: new Date(),
-            d: /hi/igm,
-            e: /hello/
-        },
-        y: 'y',
-        z: new Date()
-    };
-
-    var dupsArray = [nestedObj, { z: 'z' }, nestedObj];
-    var reducedDupsArray = [nestedObj, { z: 'z' }];
-
-    describe('#clone', function () {
-
-        it('should clone a nested object', function (done) {
-
-            var a = nestedObj;
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.z.getTime()).to.equal(b.z.getTime());
-            done();
-        });
-
-        it('should clone a null object', function (done) {
-
-            var b = Hoek.clone(null);
-
-            expect(b).to.equal(null);
-            done();
-        });
-
-        it('should not convert undefined properties to null', function (done) {
-
-            var obj = { something: undefined };
-            var b = Hoek.clone(obj);
-
-            expect(typeof b.something).to.equal('undefined');
-            done();
-        });
-
-        it('should not throw on circular reference', function (done) {
-
-            var a = {};
-            a.x = a;
-
-            var test = (function () {
-
-                var b = Hoek.clone(a);
-            });
-
-            expect(test).to.not.throw();
-            done();
-        });
-
-        it('should properly clone circular reference', function (done) {
-
-            var x = {
-                'z': new Date()
-            };
-            x.y = x;
-
-            var b = Hoek.clone(x);
-            expect(Object.keys(b.y)).to.deep.equal(Object.keys(x))
-            expect(b.z).to.not.equal(x.z);
-            expect(b.y).to.not.equal(x.y);
-            expect(b.y.z).to.not.equal(x.y.z);
-            expect(b.y).to.equal(b);
-            expect(b.y.y.y.y).to.equal(b);
-            done();
-        });
-
-        it('should properly clone deeply nested object', function (done) {
-
-            var a = {
-                x: {
-                    y: {
-                        a: [1, 2, 3],
-                        b: 123456,
-                        c: new Date(),
-                        d: /hi/igm,
-                        e: /hello/
-                    },
-                }
-            };
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.x.y.c.getTime()).to.equal(b.x.y.c.getTime());
-            done();
-        });
-
-        it('should properly clone arrays', function (done) {
-
-            var a = [1,2,3];
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            done();
-        });
-
-        it('should perform actual copy for shallow keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            // Date
-            expect(x.z).to.not.equal(nestedObj.z);
-            expect(x.z).to.not.equal(y.z);
-
-            // Regex
-            expect(x.w).to.not.equal(nestedObj.w);
-            expect(x.w).to.not.equal(y.w);
-
-            // Array
-            expect(x.v).to.not.equal(nestedObj.v);
-            expect(x.v).to.not.equal(y.v);
-
-            // Immutable(s)
-            x.y = 5;
-            expect(x.y).to.not.equal(nestedObj.y);
-            expect(x.y).to.not.equal(y.y);
-
-            done();
-        });
-
-        it('should perform actual copy for deep keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            expect(x.x.c).to.not.equal(nestedObj.x.c);
-            expect(x.x.c).to.not.equal(y.x.c);
-
-            expect(x.x.c.getTime()).to.equal(nestedObj.x.c.getTime());
-            expect(x.x.c.getTime()).to.equal(y.x.c.getTime());
-            done();
-        });
-
-        it('copies functions with properties', function (done) {
-
-            var a = {
-                x: function () { return 1; },
-                y: {}
-            };
-            a.x.z = 'string in function';
-            a.x.v = function () { return 2; };
-            a.y.u = a.x;
-
-            var b = Hoek.clone(a);
-            expect(b.x()).to.equal(1);
-            expect(b.x.v()).to.equal(2);
-            expect(b.y.u).to.equal(b.x);
-            expect(b.x.z).to.equal('string in function');
-            done();
-        });
-
-        it('should copy a buffer', function(done){
-            var tls = {
-                key: new Buffer([1,2,3,4,5]),
-                cert: new Buffer([1,2,3,4,5,6,10])
-            }
-
-            copiedTls = Hoek.clone(tls);
-            expect(Buffer.isBuffer(copiedTls.key)).to.equal(true);
-            expect(JSON.stringify(copiedTls.key)).to.equal(JSON.stringify(tls.key))
-            expect(Buffer.isBuffer(copiedTls.cert)).to.equal(true);
-            expect(JSON.stringify(copiedTls.cert)).to.equal(JSON.stringify(tls.cert))
-            done();
-        });
-    });
-
-    describe('#merge', function () {
-
-        it('does not throw if source is null', function (done) {
-
-            var a = {};
-            var b = null;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('does not throw if source is undefined', function (done) {
-
-            var a = {};
-            var b = undefined;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('throws if source is not an object', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = 0;
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid source value: must be null, undefined, or an object');
-            done();
-        });
-
-        it('throws if target is not an object', function (done) {
-
-            expect(function () {
-
-                var a = 0;
-                var b = {};
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid target value: must be an object');
-            done();
-        });
-
-        it('throws if target is not an array and source is', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = [1, 2];
-
-                Hoek.merge(a, b);
-            }).to.throw('Cannot merge array onto an object');
-            done();
-        });
-
-        it('returns the same object when merging arrays', function (done) {
-
-            var a = [];
-            var b = [1, 2];
-
-            expect(Hoek.merge(a, b)).to.equal(a);
-            done();
-        });
-
-        it('should combine an empty object with a non-empty object', function (done) {
-
-            var a = {};
-            var b = nestedObj;
-
-            var c = Hoek.merge(a, b);
-            expect(a).to.deep.equal(b);
-            expect(c).to.deep.equal(b);
-            done();
-        });
-
-        it('should override values in target', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var c = Hoek.merge(a, b);
-            expect(c.x).to.equal(null);
-            expect(c.y).to.equal(2);
-            expect(c.z).to.equal(4);
-            expect(c.v).to.equal(0);
-            expect(c.m).to.equal('123');
-            expect(c.t).to.deep.equal({ u: 6 });
-            done();
-        });
-
-        it('should override values in target (flip)', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var d = Hoek.merge(b, a);
-            expect(d.x).to.equal(1);
-            expect(d.y).to.equal(2);
-            expect(d.z).to.equal(3);
-            expect(d.v).to.equal(5);
-            expect(d.m).to.equal('abc');
-            expect(d.t).to.deep.equal('test');
-            done();
-        });
-    });
-
-    describe('#applyToDefaults', function () {
-
-        var defaults = {
-            a: 1,
-            b: 2,
-            c: {
-                d: 3,
-                e: [5, 6]
-            },
-            f: 6,
-            g: 'test'
-        };
-
-        it('should return null if options is false', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, false);
-            expect(result).to.equal(null);
-            done();
-        });
-
-        it('should return a copy of defaults if options is true', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, true);
-            expect(result).to.deep.equal(result);
-            done();
-        });
-
-        it('should apply object to defaults', function (done) {
-
-            var obj = {
-                a: null,
-                c: {
-                    e: [4]
-                },
-                f: 0,
-                g: {
-                    h: 5
-                }
-            };
-
-            var result = Hoek.applyToDefaults(defaults, obj);
-            expect(result.c.e).to.deep.equal([4]);
-            expect(result.a).to.equal(1);
-            expect(result.b).to.equal(2);
-            expect(result.f).to.equal(0);
-            expect(result.g).to.deep.equal({ h: 5 });
-            done();
-        });
-    });
-
-    describe('#unique', function () {
-
-        it('should ensure uniqueness within array of objects based on subkey', function (done) {
-
-            var a = Hoek.unique(dupsArray, 'x');
-            expect(a).to.deep.equal(reducedDupsArray);
-            done();
-        });
-
-        it('removes duplicated without key', function (done) {
-
-            expect(Hoek.unique([1, 2, 3, 4, 2, 1, 5])).to.deep.equal([1, 2, 3, 4, 5]);
-            done();
-        });
-    });
-
-    describe('#mapToObject', function () {
-
-        it('should return null on null array', function (done) {
-
-            var a = Hoek.mapToObject(null);
-            expect(a).to.equal(null);
-            done();
-        });
-
-        it('should convert basic array to existential object', function (done) {
-
-            var keys = [1, 2, 3, 4];
-            var a = Hoek.mapToObject(keys);
-            for (var i in keys) {
-                expect(a[keys[i]]).to.equal(true);
-            }
-            done();
-        });
-
-        it('should convert array of objects to existential object', function (done) {
-
-            var keys = [{ x: 1 }, { x: 2 }, { x: 3 }];
-            var subkey = 'x';
-            var a = Hoek.mapToObject(keys, subkey);
-            for (var i in keys) {
-                expect(a[keys[i][subkey]]).to.equal(true);
-            }
-            done();
-        });
-    });
-
-    describe('#intersect', function () {
-
-        it('should return the common objects of two arrays', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(array1, array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-
-        it('should return an empty array if either input is null', function (done) {
-
-            expect(Hoek.intersect([1], null).length).to.equal(0);
-            expect(Hoek.intersect(null, [1]).length).to.equal(0);
-            done();
-        });
-
-        it('should return the common objects of object and array', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(Hoek.mapToObject(array1), array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-    });
-
-    describe('#matchKeys', function () {
-
-        it('should match the existing object keys', function (done) {
-
-            var obj = {
-                a: 1,
-                b: 2,
-                c: 3,
-                d: null
-            };
-
-            expect(Hoek.matchKeys(obj, ['b', 'c', 'd', 'e'])).to.deep.equal(['b', 'c', 'd']);
-            done();
-        });
-    });
-
-    describe('#flatten', function () {
-
-        it('should return a flat array', function (done) {
-
-            var result = Hoek.flatten([1, 2, [3, 4, [5, 6], [7], 8], [9], [10, [11, 12]], 13]);
-            expect(result.length).to.equal(13);
-            expect(result).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-            done();
-        });
-    });
-
-    describe('#removeKeys', function () {
-
-        var objWithHiddenKeys = {
-            location: {
-                name: 'San Bruno'
-            },
-            company: {
-                name: '@WalmartLabs'
-            }
-        };
-
-        it('should delete params with definition\'s hide set to true', function (done) {
-
-            var a = Hoek.removeKeys(objWithHiddenKeys, ['location']);
-            expect(objWithHiddenKeys.location).to.not.exist;
-            expect(objWithHiddenKeys.company).to.exist;
-            done();
-        });
-    });
-
-    describe('#reach', function () {
-
-        var obj = {
-            a: {
-                b: {
-                    c: {
-                        d: 1,
-                        e: 2
-                    },
-                    f: 'hello'
-                },
-                g: {
-                    h: 3
-                }
-            },
-            i: function () { }
-        };
-
-        it('returns a valid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d')).to.equal(1);
-            done();
-        });
-
-        it('returns null on null object', function (done) {
-
-            expect(Hoek.reach(null, 'a.b.c.d')).to.not.exist;
-            done();
-        });
-
-        it('returns null on missing member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d.x')).to.not.exist;
-            done();
-        });
-
-        it('returns null on invalid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d-.x')).to.not.exist;
-            done();
-        });
-
-        it('returns function member', function (done) {
-
-            expect(typeof Hoek.reach(obj, 'i')).to.equal('function');
-            done();
-        });
-    });
-
-    describe('#inheritAsync', function () {
-
-        it('should inherit selected methods and wrap in async call', function (done) {
-
-            var proto = {
-                a: function () {
-                    return 'a!';
-                },
-                b: function () {
-                    return 'b!';
-                },
-                c: function () {
-                    throw new Error('c!');
-                }
-            };
-
-            var targetFunc = function () { };
-            targetFunc.prototype.c = function () {
-
-                return 'oops';
-            };
-
-            Hoek.inheritAsync(targetFunc, proto, ['a', 'c']);
-            var target = new targetFunc();
-
-            expect(typeof target.a).to.equal('function');
-            expect(typeof target.c).to.equal('function');
-            expect(target.b).to.not.exist;
-
-            target.a(function (err, result) {
-
-                expect(err).to.not.exist;
-                expect(result).to.equal('a!');
-
-                target.c(function (err, result) {
-
-                    expect(result).to.not.exist;
-                    expect(err.message).to.equal('c!');
-                    done();
-                });
-            });
-        });
-    });
-
-    describe('#callStack', function () {
-
-        it('should return the full call stack', function (done) {
-
-            var stack = Hoek.callStack();
-            expect(stack[0][0]).to.contain('index.js');
-            expect(stack[0][2]).to.equal(30);
-            done();
-        });
-    });
-
-    describe('#displayStack ', function () {
-
-        it('should return the full call stack for display', function (done) {
-
-            var stack = Hoek.displayStack();
-            expect(stack[0]).to.contain('test/index.js:');
-            done();
-        });
-
-        it('should include constructor functions correctly', function (done) {
-
-            var Something = function (next) {
-
-                next();
-            };
-
-            var something = new Something(function () {
-
-                var stack = Hoek.displayStack();
-                expect(stack[1]).to.contain('new Something');
-                done();
-            });
-        });
-    });
-
-    describe('#abort', function () {
-
-        it('should exit process when not in test mode', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-
-            process.env.NODE_ENV = 'nottatest';
-            process.stdout.write = function () { };
-            process.exit = function (state) {
-
-                process.exit = exit;
-                process.env.NODE_ENV = env;
-                process.stdout.write = write;
-
-                expect(state).to.equal(1);
-                done();
-            };
-
-            Hoek.abort('Boom');
-        });
-
-        it('should throw when not in test mode and abortThrow is true', function (done) {
-
-            var env = process.env.NODE_ENV;
-            process.env.NODE_ENV = 'nottatest';
-            Hoek.abortThrow = true;
-
-            var fn = function () {
-
-                Hoek.abort('my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            Hoek.abortThrow = false;
-            process.env.NODE_ENV = env;
-
-            done();
-        });
-
-
-        it('should respect hideStack argument', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message', true);
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.equal('ABORT: my error message\n\t\n');
-
-            done();
-        });
-
-        it('should default to showing stack', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message');
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.contain('index.js');
-
-            done();
-        });
-    });
-
-    describe('#assert', function () {
-
-        it('should throw an Error when using assert in a test', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with no message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false);
-            };
-
-            expect(fn).to.throw('Unknown error');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with multipart message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', 'my message');
-            };
-
-            expect(fn).to.throw('This is my message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', { spinal: 'tap' });
-            };
-
-            expect(fn).to.throw('This is {"spinal":"tap"}');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with error object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, new Error('This is spinal tap'));
-            };
-
-            expect(fn).to.throw('This is spinal tap');
-            done();
-        });
-    });
-
-    describe('#loadDirModules', function () {
-
-        it('should load modules from directory', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], target);
-            expect(target.Test1.x).to.equal(1);
-            expect(target.Test2).to.not.exist;
-            expect(target.Test3.z).to.equal(3);
-            done();
-        });
-
-        it('should list modules from directory into function', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], function (path, name, capName) {
-
-                target[name] = capName;
-            });
-
-            expect(target.test1).to.equal('Test1');
-            expect(target.test2).to.not.exist;
-            expect(target.test3).to.equal('Test3');
-            done();
-        });
-    });
-
-    describe('#rename', function () {
-
-        it('should rename object key', function (done) {
-
-            var a = { b: 'c' };
-            Hoek.rename(a, 'b', 'x');
-            expect(a.b).to.not.exist;
-            expect(a.x).to.equal('c');
-            done();
-        });
-    });
-
-    describe('Timer', function () {
-
-        it('should return time elapsed', function (done) {
-
-            var timer = new Hoek.Timer();
-            setTimeout(function () {
-
-                expect(timer.elapsed()).to.be.above(9);
-                done();
-            }, 12);
-        });
-    });
-
-    describe('#loadPackage', function () {
-
-        it('should', function (done) {
-
-            var pack = Hoek.loadPackage();
-            expect(pack.name).to.equal('hoek');
-            done();
-        });
-    });
-
-    describe('#escapeRegex', function () {
-
-        it('should escape all special regular expression characters', function (done) {
-
-            var a = Hoek.escapeRegex('4^f$s.4*5+-_?%=#!:@|~\\/`"(>)[<]d{}s,');
-            expect(a).to.equal('4\\^f\\$s\\.4\\*5\\+\\-_\\?%\\=#\\!\\:@\\|~\\\\\\/`"\\(>\\)\\[<\\]d\\{\\}s\\,');
-            done();
-        });
-    });
-
-    describe('#toss', function () {
-
-        it('should call callback with new error', function (done) {
-
-            var callback = function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('bug');
-                done();
-            };
-
-            Hoek.toss(true, 'feature', callback);
-            Hoek.toss(false, 'bug', callback);
-        });
-
-        it('should call callback with new error and no message', function (done) {
-
-            Hoek.toss(false, function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('');
-                done();
-            });
-        });
-
-        it('should call callback with error condition', function (done) {
-
-            Hoek.toss(new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using message with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), 'boom', function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using passed error with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-    });
-
-    describe('Base64Url', function () {
-
-        var base64str = 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w';
-        var str = unescape('%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20%21%22%23%24%25%26%27%28%29*+%2C-./0123456789%3A%3B%3C%3D%3E%3F@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D%7E%7F%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF');
-
-        describe('#base64urlEncode', function () {
-
-            it('should base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlEncode(str)).to.equal(base64str);
-                done();
-            });
-        });
-
-        describe('#base64urlDecode', function () {
-
-            it('should un-base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlDecode(base64str)).to.equal(str);
-                done();
-            });
-
-            it('should return error on undefined input', function (done) {
-
-                expect(Hoek.base64urlDecode().message).to.exist;
-                done();
-            });
-
-            it('should return error on invalid input', function (done) {
-
-                expect(Hoek.base64urlDecode('*').message).to.exist;
-                done();
-            });
-        });
-    });
-
-    describe('#escapeHeaderAttribute', function () {
-
-        it('should not alter ascii values', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('My Value');
-            expect(a).to.equal('My Value');
-            done();
-        });
-
-        it('should escape all special HTTP header attribute characters', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('I said go!!!#"' + String.fromCharCode(92));
-            expect(a).to.equal('I said go!!!#\\"\\\\');
-            done();
-        });
-
-        it('should throw on large unicode characters', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test' + String.fromCharCode(500) + String.fromCharCode(300));
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-
-        it('should throw on CRLF to prevent response splitting', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test\r\n');
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('should escape all special HTML characters', function (done) {
-
-            var a = Hoek.escapeHtml('&<>"\'`');
-            expect(a).to.equal('&amp;&lt;&gt;&quot;&#x27;&#x60;');
-            done();
-        });
-
-        it('should return empty string on falsy input', function (done) {
-
-            var a = Hoek.escapeHtml('');
-            expect(a).to.equal('');
-            done();
-        });
-
-        it('should return unchanged string on no reserved input', function (done) {
-
-            var a = Hoek.escapeHtml('abc');
-            expect(a).to.equal('abc');
-            done();
-        });
-    });
-
-    describe('#printEvent', function () {
-
-        it('outputs event as string', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, {"some":"data"}');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-
-        it('outputs JSON error', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            event.data.a = event.data;
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, JSON Error: Converting circular structure to JSON');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-    });
-
-    describe('#nextTick', function () {
-
-        it('calls the provided callback on nextTick', function (done) {
-
-            var a = 0;
-
-            var inc = function (step, next) {
-
-                a += step;
-                next();
-            };
-
-            var ticked = Hoek.nextTick(inc);
-
-            ticked(5, function () {
-
-                expect(a).to.equal(6);
-                done();
-            });
-
-            expect(a).to.equal(0);
-            inc(1, function () {
-
-                expect(a).to.equal(1);
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js b/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js
deleted file mode 100755
index fa4e06abe0..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test1.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.x = 1;
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js b/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js
deleted file mode 100755
index 88e9166e86..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test2.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.y = 2;
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js b/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js
deleted file mode 100755
index 670e724a6e..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/test/modules/test3.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.z = 3;
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/escaper.js b/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/escaper.js
deleted file mode 100644
index 4dddd77dc9..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/escaper.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    describe('#escapeJavaScript', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('<script>alert(1)</script>');
-            expect(encoded).to.equal('\\x3cscript\\x3ealert\\x281\\x29\\x3c\\x2fscript\\x3e');
-            done();
-        });
-
-        it('encodes \' characters', function (done) {
-
-            var encoded = Hoek.escapeJavaScript('something(\'param\')');
-            expect(encoded).to.equal('something\\x28\\x27param\\x27\\x29');
-            done();
-        });
-
-        it('encodes large unicode characters with the correct padding', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('\\u0500\\u1000');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeJavaScript(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('encodes / characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script>alert(1)</script>');
-            expect(encoded).to.equal('&lt;script&gt;alert&#x28;1&#x29;&lt;&#x2f;script&gt;');
-            done();
-        });
-
-        it('encodes < and > as named characters', function (done) {
-
-            var encoded = Hoek.escapeHtml('<script><>');
-            expect(encoded).to.equal('&lt;script&gt;&lt;&gt;');
-            done();
-        });
-
-        it('encodes large unicode characters', function (done) {
-
-            var encoded = Hoek.escapeHtml(String.fromCharCode(500) + String.fromCharCode(1000));
-            expect(encoded).to.equal('&#500;&#1000;');
-            done();
-        });
-
-        it('doesn\'t throw an exception when passed null', function (done) {
-
-            var encoded = Hoek.escapeHtml(null);
-            expect(encoded).to.equal('');
-            done();
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/index.js b/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/index.js
deleted file mode 100755
index c40e3ad9a4..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/index.js
+++ /dev/null
@@ -1,1078 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hoek', function () {
-
-    var nestedObj = {
-        v: [7,8,9],
-        w: /^something$/igm,
-        x: {
-            a: [1, 2, 3],
-            b: 123456,
-            c: new Date(),
-            d: /hi/igm,
-            e: /hello/
-        },
-        y: 'y',
-        z: new Date()
-    };
-
-    var dupsArray = [nestedObj, { z: 'z' }, nestedObj];
-    var reducedDupsArray = [nestedObj, { z: 'z' }];
-
-    describe('#clone', function () {
-
-        it('should clone a nested object', function (done) {
-
-            var a = nestedObj;
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.z.getTime()).to.equal(b.z.getTime());
-            done();
-        });
-
-        it('should clone a null object', function (done) {
-
-            var b = Hoek.clone(null);
-
-            expect(b).to.equal(null);
-            done();
-        });
-
-        it('should not convert undefined properties to null', function (done) {
-
-            var obj = { something: undefined };
-            var b = Hoek.clone(obj);
-
-            expect(typeof b.something).to.equal('undefined');
-            done();
-        });
-
-        it('should not throw on circular reference', function (done) {
-
-            var a = {};
-            a.x = a;
-
-            var test = (function () {
-
-                var b = Hoek.clone(a);
-            });
-
-            expect(test).to.not.throw();
-            done();
-        });
-
-        it('should properly clone circular reference', function (done) {
-
-            var x = {
-                'z': new Date()
-            };
-            x.y = x;
-
-            var b = Hoek.clone(x);
-            expect(Object.keys(b.y)).to.deep.equal(Object.keys(x))
-            expect(b.z).to.not.equal(x.z);
-            expect(b.y).to.not.equal(x.y);
-            expect(b.y.z).to.not.equal(x.y.z);
-            expect(b.y).to.equal(b);
-            expect(b.y.y.y.y).to.equal(b);
-            done();
-        });
-
-        it('should properly clone deeply nested object', function (done) {
-
-            var a = {
-                x: {
-                    y: {
-                        a: [1, 2, 3],
-                        b: 123456,
-                        c: new Date(),
-                        d: /hi/igm,
-                        e: /hello/
-                    },
-                }
-            };
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            expect(a.x.y.c.getTime()).to.equal(b.x.y.c.getTime());
-            done();
-        });
-
-        it('should properly clone arrays', function (done) {
-
-            var a = [1,2,3];
-
-            var b = Hoek.clone(a);
-
-            expect(a).to.deep.equal(b);
-            done();
-        });
-
-        it('should perform actual copy for shallow keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            // Date
-            expect(x.z).to.not.equal(nestedObj.z);
-            expect(x.z).to.not.equal(y.z);
-
-            // Regex
-            expect(x.w).to.not.equal(nestedObj.w);
-            expect(x.w).to.not.equal(y.w);
-
-            // Array
-            expect(x.v).to.not.equal(nestedObj.v);
-            expect(x.v).to.not.equal(y.v);
-
-            // Immutable(s)
-            x.y = 5;
-            expect(x.y).to.not.equal(nestedObj.y);
-            expect(x.y).to.not.equal(y.y);
-
-            done();
-        });
-
-        it('should perform actual copy for deep keys (no pass by reference)', function (done) {
-
-            var x = Hoek.clone(nestedObj);
-            var y = Hoek.clone(nestedObj);
-
-            expect(x.x.c).to.not.equal(nestedObj.x.c);
-            expect(x.x.c).to.not.equal(y.x.c);
-
-            expect(x.x.c.getTime()).to.equal(nestedObj.x.c.getTime());
-            expect(x.x.c.getTime()).to.equal(y.x.c.getTime());
-            done();
-        });
-
-        it('copies functions with properties', function (done) {
-
-            var a = {
-                x: function () { return 1; },
-                y: {}
-            };
-            a.x.z = 'string in function';
-            a.x.v = function () { return 2; };
-            a.y.u = a.x;
-
-            var b = Hoek.clone(a);
-            expect(b.x()).to.equal(1);
-            expect(b.x.v()).to.equal(2);
-            expect(b.y.u).to.equal(b.x);
-            expect(b.x.z).to.equal('string in function');
-            done();
-        });
-
-        it('should copy a buffer', function(done){
-            var tls = {
-                key: new Buffer([1,2,3,4,5]),
-                cert: new Buffer([1,2,3,4,5,6,10])
-            }
-
-            copiedTls = Hoek.clone(tls);
-            expect(Buffer.isBuffer(copiedTls.key)).to.equal(true);
-            expect(JSON.stringify(copiedTls.key)).to.equal(JSON.stringify(tls.key))
-            expect(Buffer.isBuffer(copiedTls.cert)).to.equal(true);
-            expect(JSON.stringify(copiedTls.cert)).to.equal(JSON.stringify(tls.cert))
-            done();
-        });
-    });
-
-    describe('#merge', function () {
-
-        it('does not throw if source is null', function (done) {
-
-            var a = {};
-            var b = null;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('does not throw if source is undefined', function (done) {
-
-            var a = {};
-            var b = undefined;
-            var c = null;
-
-            expect(function () {
-
-                c = Hoek.merge(a, b);
-            }).to.not.throw();
-
-            expect(c).to.equal(a);
-            done();
-        });
-
-        it('throws if source is not an object', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = 0;
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid source value: must be null, undefined, or an object');
-            done();
-        });
-
-        it('throws if target is not an object', function (done) {
-
-            expect(function () {
-
-                var a = 0;
-                var b = {};
-
-                Hoek.merge(a, b);
-            }).to.throw('Invalid target value: must be an object');
-            done();
-        });
-
-        it('throws if target is not an array and source is', function (done) {
-
-            expect(function () {
-
-                var a = {};
-                var b = [1, 2];
-
-                Hoek.merge(a, b);
-            }).to.throw('Cannot merge array onto an object');
-            done();
-        });
-
-        it('returns the same object when merging arrays', function (done) {
-
-            var a = [];
-            var b = [1, 2];
-
-            expect(Hoek.merge(a, b)).to.equal(a);
-            done();
-        });
-
-        it('should combine an empty object with a non-empty object', function (done) {
-
-            var a = {};
-            var b = nestedObj;
-
-            var c = Hoek.merge(a, b);
-            expect(a).to.deep.equal(b);
-            expect(c).to.deep.equal(b);
-            done();
-        });
-
-        it('should override values in target', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var c = Hoek.merge(a, b);
-            expect(c.x).to.equal(null);
-            expect(c.y).to.equal(2);
-            expect(c.z).to.equal(4);
-            expect(c.v).to.equal(0);
-            expect(c.m).to.equal('123');
-            expect(c.t).to.deep.equal({ u: 6 });
-            done();
-        });
-
-        it('should override values in target (flip)', function (done) {
-
-            var a = { x: 1, y: 2, z: 3, v: 5, t: 'test', m: 'abc' };
-            var b = { x: null, z: 4, v: 0, t: { u: 6 }, m: '123' };
-
-            var d = Hoek.merge(b, a);
-            expect(d.x).to.equal(1);
-            expect(d.y).to.equal(2);
-            expect(d.z).to.equal(3);
-            expect(d.v).to.equal(5);
-            expect(d.m).to.equal('abc');
-            expect(d.t).to.deep.equal('test');
-            done();
-        });
-    });
-
-    describe('#applyToDefaults', function () {
-
-        var defaults = {
-            a: 1,
-            b: 2,
-            c: {
-                d: 3,
-                e: [5, 6]
-            },
-            f: 6,
-            g: 'test'
-        };
-
-        it('should return null if options is false', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, false);
-            expect(result).to.equal(null);
-            done();
-        });
-
-        it('should return a copy of defaults if options is true', function (done) {
-
-            var result = Hoek.applyToDefaults(defaults, true);
-            expect(result).to.deep.equal(result);
-            done();
-        });
-
-        it('should apply object to defaults', function (done) {
-
-            var obj = {
-                a: null,
-                c: {
-                    e: [4]
-                },
-                f: 0,
-                g: {
-                    h: 5
-                }
-            };
-
-            var result = Hoek.applyToDefaults(defaults, obj);
-            expect(result.c.e).to.deep.equal([4]);
-            expect(result.a).to.equal(1);
-            expect(result.b).to.equal(2);
-            expect(result.f).to.equal(0);
-            expect(result.g).to.deep.equal({ h: 5 });
-            done();
-        });
-    });
-
-    describe('#unique', function () {
-
-        it('should ensure uniqueness within array of objects based on subkey', function (done) {
-
-            var a = Hoek.unique(dupsArray, 'x');
-            expect(a).to.deep.equal(reducedDupsArray);
-            done();
-        });
-
-        it('removes duplicated without key', function (done) {
-
-            expect(Hoek.unique([1, 2, 3, 4, 2, 1, 5])).to.deep.equal([1, 2, 3, 4, 5]);
-            done();
-        });
-    });
-
-    describe('#mapToObject', function () {
-
-        it('should return null on null array', function (done) {
-
-            var a = Hoek.mapToObject(null);
-            expect(a).to.equal(null);
-            done();
-        });
-
-        it('should convert basic array to existential object', function (done) {
-
-            var keys = [1, 2, 3, 4];
-            var a = Hoek.mapToObject(keys);
-            for (var i in keys) {
-                expect(a[keys[i]]).to.equal(true);
-            }
-            done();
-        });
-
-        it('should convert array of objects to existential object', function (done) {
-
-            var keys = [{ x: 1 }, { x: 2 }, { x: 3 }];
-            var subkey = 'x';
-            var a = Hoek.mapToObject(keys, subkey);
-            for (var i in keys) {
-                expect(a[keys[i][subkey]]).to.equal(true);
-            }
-            done();
-        });
-    });
-
-    describe('#intersect', function () {
-
-        it('should return the common objects of two arrays', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(array1, array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-
-        it('should return just the first common object of two arrays', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(array1, array2, true);
-            expect(common).to.equal(5);
-            done();
-        });
-
-        it('should return an empty array if either input is null', function (done) {
-
-            expect(Hoek.intersect([1], null).length).to.equal(0);
-            expect(Hoek.intersect(null, [1]).length).to.equal(0);
-            done();
-        });
-
-        it('should return the common objects of object and array', function (done) {
-
-            var array1 = [1, 2, 3, 4, 4, 5, 5];
-            var array2 = [5, 4, 5, 6, 7];
-            var common = Hoek.intersect(Hoek.mapToObject(array1), array2);
-            expect(common.length).to.equal(2);
-            done();
-        });
-    });
-
-    describe('#matchKeys', function () {
-
-        it('should match the existing object keys', function (done) {
-
-            var obj = {
-                a: 1,
-                b: 2,
-                c: 3,
-                d: null
-            };
-
-            expect(Hoek.matchKeys(obj, ['b', 'c', 'd', 'e'])).to.deep.equal(['b', 'c', 'd']);
-            done();
-        });
-    });
-
-    describe('#flatten', function () {
-
-        it('should return a flat array', function (done) {
-
-            var result = Hoek.flatten([1, 2, [3, 4, [5, 6], [7], 8], [9], [10, [11, 12]], 13]);
-            expect(result.length).to.equal(13);
-            expect(result).to.deep.equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
-            done();
-        });
-    });
-
-    describe('#removeKeys', function () {
-
-        var objWithHiddenKeys = {
-            location: {
-                name: 'San Bruno'
-            },
-            company: {
-                name: '@WalmartLabs'
-            }
-        };
-
-        it('should delete params with definition\'s hide set to true', function (done) {
-
-            var a = Hoek.removeKeys(objWithHiddenKeys, ['location']);
-            expect(objWithHiddenKeys.location).to.not.exist;
-            expect(objWithHiddenKeys.company).to.exist;
-            done();
-        });
-    });
-
-    describe('#reach', function () {
-
-        var obj = {
-            a: {
-                b: {
-                    c: {
-                        d: 1,
-                        e: 2
-                    },
-                    f: 'hello'
-                },
-                g: {
-                    h: 3
-                }
-            },
-            i: function () { }
-        };
-
-        it('returns a valid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d')).to.equal(1);
-            done();
-        });
-
-        it('returns null on null object', function (done) {
-
-            expect(Hoek.reach(null, 'a.b.c.d')).to.not.exist;
-            done();
-        });
-
-        it('returns null on missing member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d.x')).to.not.exist;
-            done();
-        });
-
-        it('returns null on invalid member', function (done) {
-
-            expect(Hoek.reach(obj, 'a.b.c.d-.x')).to.not.exist;
-            done();
-        });
-
-        it('returns function member', function (done) {
-
-            expect(typeof Hoek.reach(obj, 'i')).to.equal('function');
-            done();
-        });
-    });
-
-    describe('#inheritAsync', function () {
-
-        it('should inherit selected methods and wrap in async call', function (done) {
-
-            var proto = {
-                a: function () {
-                    return 'a!';
-                },
-                b: function () {
-                    return 'b!';
-                },
-                c: function () {
-                    throw new Error('c!');
-                }
-            };
-
-            var targetFunc = function () { };
-            targetFunc.prototype.c = function () {
-
-                return 'oops';
-            };
-
-            Hoek.inheritAsync(targetFunc, proto, ['a', 'c']);
-            var target = new targetFunc();
-
-            expect(typeof target.a).to.equal('function');
-            expect(typeof target.c).to.equal('function');
-            expect(target.b).to.not.exist;
-
-            target.a(function (err, result) {
-
-                expect(err).to.not.exist;
-                expect(result).to.equal('a!');
-
-                target.c(function (err, result) {
-
-                    expect(result).to.not.exist;
-                    expect(err.message).to.equal('c!');
-                    done();
-                });
-            });
-        });
-    });
-
-    describe('#callStack', function () {
-
-        it('should return the full call stack', function (done) {
-
-            var stack = Hoek.callStack();
-            expect(stack[0][0]).to.contain('index.js');
-            expect(stack[0][2]).to.equal(30);
-            done();
-        });
-    });
-
-    describe('#displayStack ', function () {
-
-        it('should return the full call stack for display', function (done) {
-
-            var stack = Hoek.displayStack();
-            expect(stack[0]).to.contain('test/index.js:');
-            done();
-        });
-
-        it('should include constructor functions correctly', function (done) {
-
-            var Something = function (next) {
-
-                next();
-            };
-
-            var something = new Something(function () {
-
-                var stack = Hoek.displayStack();
-                expect(stack[1]).to.contain('new Something');
-                done();
-            });
-        });
-    });
-
-    describe('#abort', function () {
-
-        it('should exit process when not in test mode', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-
-            process.env.NODE_ENV = 'nottatest';
-            process.stdout.write = function () { };
-            process.exit = function (state) {
-
-                process.exit = exit;
-                process.env.NODE_ENV = env;
-                process.stdout.write = write;
-
-                expect(state).to.equal(1);
-                done();
-            };
-
-            Hoek.abort('Boom');
-        });
-
-        it('should throw when not in test mode and abortThrow is true', function (done) {
-
-            var env = process.env.NODE_ENV;
-            process.env.NODE_ENV = 'nottatest';
-            Hoek.abortThrow = true;
-
-            var fn = function () {
-
-                Hoek.abort('my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            Hoek.abortThrow = false;
-            process.env.NODE_ENV = env;
-
-            done();
-        });
-
-
-        it('should respect hideStack argument', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message', true);
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.equal('ABORT: my error message\n\t\n');
-
-            done();
-        });
-
-        it('should default to showing stack', function (done) {
-
-            var env = process.env.NODE_ENV;
-            var write = process.stdout.write;
-            var exit = process.exit;
-            var output = '';
-
-            process.exit = function () { };
-            process.env.NODE_ENV = '';
-            process.stdout.write = function (message) {
-
-                output = message;
-            };
-
-            Hoek.abort('my error message');
-
-            process.env.NODE_ENV = env;
-            process.stdout.write = write;
-            process.exit = exit;
-
-            expect(output).to.contain('index.js');
-
-            done();
-        });
-    });
-
-    describe('#assert', function () {
-
-        it('should throw an Error when using assert in a test', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'my error message');
-            };
-
-            expect(fn).to.throw('my error message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with no message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false);
-            };
-
-            expect(fn).to.throw('Unknown error');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with multipart message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', 'my message');
-            };
-
-            expect(fn).to.throw('This is my message');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, 'This', 'is', { spinal: 'tap' });
-            };
-
-            expect(fn).to.throw('This is {"spinal":"tap"}');
-            done();
-        });
-
-        it('should throw an Error when using assert in a test with error object message', function (done) {
-
-            var fn = function () {
-
-                Hoek.assert(false, new Error('This is spinal tap'));
-            };
-
-            expect(fn).to.throw('This is spinal tap');
-            done();
-        });
-    });
-
-    describe('#loadDirModules', function () {
-
-        it('should load modules from directory', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], target);
-            expect(target.Test1.x).to.equal(1);
-            expect(target.Test2).to.not.exist;
-            expect(target.Test3.z).to.equal(3);
-            done();
-        });
-
-        it('should list modules from directory into function', function (done) {
-
-            var target = {};
-            Hoek.loadDirModules(__dirname + '/modules', ['test2'], function (path, name, capName) {
-
-                target[name] = capName;
-            });
-
-            expect(target.test1).to.equal('Test1');
-            expect(target.test2).to.not.exist;
-            expect(target.test3).to.equal('Test3');
-            done();
-        });
-    });
-
-    describe('#rename', function () {
-
-        it('should rename object key', function (done) {
-
-            var a = { b: 'c' };
-            Hoek.rename(a, 'b', 'x');
-            expect(a.b).to.not.exist;
-            expect(a.x).to.equal('c');
-            done();
-        });
-    });
-
-    describe('Timer', function () {
-
-        it('should return time elapsed', function (done) {
-
-            var timer = new Hoek.Timer();
-            setTimeout(function () {
-
-                expect(timer.elapsed()).to.be.above(9);
-                done();
-            }, 12);
-        });
-    });
-
-    describe('#loadPackage', function () {
-
-        it('should', function (done) {
-
-            var pack = Hoek.loadPackage();
-            expect(pack.name).to.equal('hoek');
-            done();
-        });
-    });
-
-    describe('#escapeRegex', function () {
-
-        it('should escape all special regular expression characters', function (done) {
-
-            var a = Hoek.escapeRegex('4^f$s.4*5+-_?%=#!:@|~\\/`"(>)[<]d{}s,');
-            expect(a).to.equal('4\\^f\\$s\\.4\\*5\\+\\-_\\?%\\=#\\!\\:@\\|~\\\\\\/`"\\(>\\)\\[<\\]d\\{\\}s\\,');
-            done();
-        });
-    });
-
-    describe('#toss', function () {
-
-        it('should call callback with new error', function (done) {
-
-            var callback = function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('bug');
-                done();
-            };
-
-            Hoek.toss(true, 'feature', callback);
-            Hoek.toss(false, 'bug', callback);
-        });
-
-        it('should call callback with new error and no message', function (done) {
-
-            Hoek.toss(false, function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('');
-                done();
-            });
-        });
-
-        it('should call callback with error condition', function (done) {
-
-            Hoek.toss(new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using message with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), 'boom', function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-
-        it('should call callback with new error using passed error with error condition', function (done) {
-
-            Hoek.toss(new Error('ka'), new Error('boom'), function (err) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('boom');
-                done();
-            });
-        });
-    });
-
-    describe('Base64Url', function () {
-
-        var base64str = 'AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0-P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn-AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq-wsbKztLW2t7i5uru8vb6_wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t_g4eLj5OXm5-jp6uvs7e7v8PHy8_T19vf4-fr7_P3-_w';
-        var str = unescape('%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%20%21%22%23%24%25%26%27%28%29*+%2C-./0123456789%3A%3B%3C%3D%3E%3F@ABCDEFGHIJKLMNOPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D%7E%7F%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF');
-
-        describe('#base64urlEncode', function () {
-
-            it('should base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlEncode(str)).to.equal(base64str);
-                done();
-            });
-        });
-
-        describe('#base64urlDecode', function () {
-
-            it('should un-base64 URL-safe a string', function (done) {
-
-                expect(Hoek.base64urlDecode(base64str)).to.equal(str);
-                done();
-            });
-
-            it('should return error on undefined input', function (done) {
-
-                expect(Hoek.base64urlDecode().message).to.exist;
-                done();
-            });
-
-            it('should return error on invalid input', function (done) {
-
-                expect(Hoek.base64urlDecode('*').message).to.exist;
-                done();
-            });
-        });
-    });
-
-    describe('#escapeHeaderAttribute', function () {
-
-        it('should not alter ascii values', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('My Value');
-            expect(a).to.equal('My Value');
-            done();
-        });
-
-        it('should escape all special HTTP header attribute characters', function (done) {
-
-            var a = Hoek.escapeHeaderAttribute('I said go!!!#"' + String.fromCharCode(92));
-            expect(a).to.equal('I said go!!!#\\"\\\\');
-            done();
-        });
-
-        it('should throw on large unicode characters', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test' + String.fromCharCode(500) + String.fromCharCode(300));
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-
-        it('should throw on CRLF to prevent response splitting', function (done) {
-
-            var fn = function () {
-
-                Hoek.escapeHeaderAttribute('this is a test\r\n');
-            };
-
-            expect(fn).to.throw(Error);
-            done();
-        });
-    });
-
-    describe('#escapeHtml', function () {
-
-        it('should escape all special HTML characters', function (done) {
-
-            var a = Hoek.escapeHtml('&<>"\'`');
-            expect(a).to.equal('&amp;&lt;&gt;&quot;&#x27;&#x60;');
-            done();
-        });
-
-        it('should return empty string on falsy input', function (done) {
-
-            var a = Hoek.escapeHtml('');
-            expect(a).to.equal('');
-            done();
-        });
-
-        it('should return unchanged string on no reserved input', function (done) {
-
-            var a = Hoek.escapeHtml('abc');
-            expect(a).to.equal('abc');
-            done();
-        });
-    });
-
-    describe('#printEvent', function () {
-
-        it('outputs event as string', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, {"some":"data"}');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-
-        it('outputs JSON error', function (done) {
-
-            var event = {
-                timestamp: (new Date(2013, 1, 1, 6, 30, 45, 123)).getTime(),
-                tags: ['a', 'b', 'c'],
-                data: { some: 'data' }
-            };
-
-            event.data.a = event.data;
-
-            Hoek.consoleFunc = function (string) {
-
-                Hoek.consoleFunc = console.log;
-                expect(string).to.equal('130201/063045.123, a, JSON Error: Converting circular structure to JSON');
-                done();
-            };
-
-            Hoek.printEvent(event);
-        });
-    });
-
-    describe('#nextTick', function () {
-
-        it('calls the provided callback on nextTick', function (done) {
-
-            var a = 0;
-
-            var inc = function (step, next) {
-
-                a += step;
-                next();
-            };
-
-            var ticked = Hoek.nextTick(inc);
-
-            ticked(5, function () {
-
-                expect(a).to.equal(6);
-                done();
-            });
-
-            expect(a).to.equal(0);
-            inc(1, function () {
-
-                expect(a).to.equal(1);
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test1.js b/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test1.js
deleted file mode 100755
index 3f41e601e5..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test1.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.x = 1;
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test2.js b/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test2.js
deleted file mode 100755
index 38556b274d..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test2.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.y = 2;
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test3.js b/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test3.js
deleted file mode 100755
index 436b860b80..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test3.js
+++ /dev/null
@@ -1 +0,0 @@
-exports.z = 3;
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js b/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
deleted file mode 100755
index 38a5534673..0000000000
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
+++ /dev/null
@@ -1,359 +0,0 @@
-// Load modules
-
-var Dgram = require('dgram');
-var Lab = require('lab');
-var Sntp = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('SNTP', function () {
-
-    describe('#time', function () {
-
-        it('returns consistent result over multiple tries', function (done) {
-
-            Sntp.time(function (err, time) {
-
-                expect(err).to.not.exist;
-                expect(time).to.exist;
-                var t1 = time.t;
-
-                Sntp.time(function (err, time) {
-
-                    expect(err).to.not.exist;
-                    expect(time).to.exist;
-                    var t2 = time.t;
-                    expect(Math.abs(t1 - t2)).is.below(200);
-                    done();
-                });
-            });
-        });
-
-        it('resolves reference IP', function (done) {
-
-            Sntp.time({ host: 'ntp.exnet.com', resolveReference: true }, function (err, time) {
-
-                expect(err).to.not.exist;
-                expect(time).to.exist;
-                expect(time.referenceHost).to.exist;
-                done();
-            });
-        });
-
-        it('times out on no response', function (done) {
-
-            Sntp.time({ port: 124, timeout: 100 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time).to.not.exist;
-                expect(err.message).to.equal('Timeout');
-                done();
-            });
-        });
-
-        it('errors on error event', function (done) {
-
-            var orig = Dgram.createSocket;
-            Dgram.createSocket = function (type) {
-
-                Dgram.createSocket = orig;
-                var socket = Dgram.createSocket(type);
-                process.nextTick(function () { socket.emit('error', new Error('Fake')) });
-                return socket;
-            };
-
-            Sntp.time(function (err, time) {
-
-                expect(err).to.exist;
-                expect(time).to.not.exist;
-                expect(err.message).to.equal('Fake');
-                done();
-            });
-        });
-
-        it('times out on invalid host', function (done) {
-
-            Sntp.time({ host: 'error', timeout: 10000 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time).to.not.exist;
-                expect(err.message).to.equal('getaddrinfo ENOTFOUND');
-                done();
-            });
-        });
-
-        it('fails on bad response buffer size', function (done) {
-
-            var server = Dgram.createSocket('udp4');
-            server.on('message', function (message, remote) {
-                var message = new Buffer(10);
-                server.send(message, 0, message.length, remote.port, remote.address, function (err, bytes) {
-
-                    server.close();
-                });
-            });
-
-            server.bind(49123);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Invalid server response');
-                done();
-            });
-        });
-
-        var messup = function (bytes) {
-
-            var server = Dgram.createSocket('udp4');
-            server.on('message', function (message, remote) {
-
-                var message = new Buffer([
-                    0x24, 0x01, 0x00, 0xe3,
-                    0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00,
-                    0x41, 0x43, 0x54, 0x53,
-                    0xd4, 0xa8, 0x2d, 0xc7,
-                    0x1c, 0x5d, 0x49, 0x1b,
-                    0xd4, 0xa8, 0x2d, 0xe6,
-                    0x67, 0xef, 0x9d, 0xb2,
-                    0xd4, 0xa8, 0x2d, 0xe6,
-                    0x71, 0xed, 0xb5, 0xfb,
-                    0xd4, 0xa8, 0x2d, 0xe6,
-                    0x71, 0xee, 0x6c, 0xc5
-                ]);
-
-                for (var i = 0, il = bytes.length; i < il; ++i) {
-                    message[bytes[i][0]] = bytes[i][1];
-                }
-
-                server.send(message, 0, message.length, remote.port, remote.address, function (err, bytes) {
-
-                    server.close();
-                });
-            });
-
-            server.bind(49123);
-        };
-
-        it('fails on bad version', function (done) {
-
-            messup([[0, (0 << 6) + (3 << 3) + (4 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.version).to.equal(3);
-                expect(err.message).to.equal('Invalid server response');
-                done();
-            });
-        });
-
-        it('fails on bad originate timestamp and alarm li', function (done) {
-
-            messup([[0, (3 << 6) + (4 << 3) + (4 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Wrong originate timestamp');
-                expect(time.leapIndicator).to.equal('alarm');
-                done();
-            });
-        });
-
-        it('returns time with death stratum and last61 li', function (done) {
-
-            messup([[0, (1 << 6) + (4 << 3) + (4 << 0)], [1, 0]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(time.stratum).to.equal('death');
-                expect(time.leapIndicator).to.equal('last-minute-61');
-                done();
-            });
-        });
-
-        it('returns time with reserved stratum and last59 li', function (done) {
-
-            messup([[0, (2 << 6) + (4 << 3) + (4 << 0)], [1, 0x1f]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(time.stratum).to.equal('reserved');
-                expect(time.leapIndicator).to.equal('last-minute-59');
-                done();
-            });
-        });
-
-        it('fails on bad mode (symmetric-active)', function (done) {
-
-            messup([[0, (0 << 6) + (4 << 3) + (1 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.mode).to.equal('symmetric-active');
-                done();
-            });
-        });
-
-        it('fails on bad mode (symmetric-passive)', function (done) {
-
-            messup([[0, (0 << 6) + (4 << 3) + (2 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.mode).to.equal('symmetric-passive');
-                done();
-            });
-        });
-
-        it('fails on bad mode (client)', function (done) {
-
-            messup([[0, (0 << 6) + (4 << 3) + (3 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.mode).to.equal('client');
-                done();
-            });
-        });
-
-        it('fails on bad mode (broadcast)', function (done) {
-
-            messup([[0, (0 << 6) + (4 << 3) + (5 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.mode).to.equal('broadcast');
-                done();
-            });
-        });
-
-        it('fails on bad mode (reserved)', function (done) {
-
-            messup([[0, (0 << 6) + (4 << 3) + (6 << 0)]]);
-
-            Sntp.time({ host: 'localhost', port: 49123 }, function (err, time) {
-
-                expect(err).to.exist;
-                expect(time.mode).to.equal('reserved');
-                done();
-            });
-        });
-    });
-
-    describe('#offset', function () {
-
-        it('gets the current offset', function (done) {
-
-            Sntp.offset(function (err, offset) {
-
-                expect(err).to.not.exist;
-                expect(offset).to.not.equal(0);
-                done();
-            });
-        });
-
-        it('gets the current offset from cache', function (done) {
-
-            Sntp.offset(function (err, offset) {
-
-                expect(err).to.not.exist;
-                expect(offset).to.not.equal(0);
-                var offset1 = offset;
-                Sntp.offset({}, function (err, offset) {
-
-                    expect(err).to.not.exist;
-                    expect(offset).to.equal(offset1);
-                    done();
-                });
-            });
-        });
-
-        it('fails getting the current offset on invalid server', function (done) {
-
-            Sntp.offset({ host: 'error' }, function (err, offset) {
-
-                expect(err).to.exist;
-                expect(offset).to.equal(0);
-                done();
-            });
-        });
-    });
-
-    describe('#now', function () {
-
-        it('starts auto-sync, gets now, then stops', function (done) {
-
-            Sntp.stop();
-
-            var before = Sntp.now();
-            expect(before).to.equal(Date.now());
-
-            Sntp.start(function () {
-
-                var now = Sntp.now();
-                expect(now).to.not.equal(Date.now());
-                Sntp.stop();
-
-                done();
-            });
-        });
-
-        it('starts twice', function (done) {
-
-            Sntp.start(function () {
-
-                Sntp.start(function () {
-
-                    var now = Sntp.now();
-                    expect(now).to.not.equal(Date.now());
-                    Sntp.stop();
-
-                    done();
-                });
-            });
-        });
-
-        it('starts auto-sync, gets now, waits, gets again after timeout', function (done) {
-
-            Sntp.stop();
-
-            var before = Sntp.now();
-            expect(before).to.equal(Date.now());
-
-            Sntp.start({ clockSyncRefresh: 100 }, function () {
-
-                var now = Sntp.now();
-                expect(now).to.not.equal(Date.now());
-                expect(now).to.equal(Sntp.now());
-
-                setTimeout(function () {
-
-                    expect(Sntp.now()).to.not.equal(now);
-                    Sntp.stop();
-                    done();
-                }, 110);
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/test/browser.js b/node_modules/request/node_modules/hawk/test/browser.js
deleted file mode 100755
index 33e0203862..0000000000
--- a/node_modules/request/node_modules/hawk/test/browser.js
+++ /dev/null
@@ -1,723 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hawk = require('../lib');
-var Browser = require('../lib/browser');
-var LocalStorage = require('localStorage');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Browser', function () {
-
-    var credentialsFunc = function (id, callback) {
-
-        var credentials = {
-            id: id,
-            key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-            algorithm: (id === '1' ? 'sha1' : 'sha256'),
-            user: 'steve'
-        };
-
-        return callback(null, credentials);
-    };
-
-    it('should generate a header then successfully parse it (configuration)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-            expect(req.authorization).to.exist;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (node request)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (no server header options)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (no server header)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header with stale ts and successfully authenticate on second call', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
-            req.authorization = header.field;
-            expect(req.authorization).to.exist;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Stale timestamp');
-
-                var res = {
-                    headers: {
-                        'www-authenticate': err.response.headers['WWW-Authenticate']
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
-                expect(Browser.utils.getNtpOffset()).to.equal(0);
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-                expect(req.authorization).to.exist;
-
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
-                    done();
-                });
-            });
-        });
-    });
-
-    it('should generate a header with stale ts and successfully authenticate on second call (manual localStorage)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-            Browser.utils.setStorage(LocalStorage)
-
-            Browser.utils.setNtpOffset(60 * 60 * 1000);
-            var header = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' });
-            req.authorization = header.field;
-            expect(req.authorization).to.exist;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Stale timestamp');
-
-                var res = {
-                    headers: {
-                        'www-authenticate': err.response.headers['WWW-Authenticate']
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(parseInt(LocalStorage.getItem('hawk_ntp_offset'))).to.equal(60 * 60 * 1000);
-                expect(Browser.utils.getNtpOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, credentials, header.artifacts)).to.equal(true);
-                expect(Browser.utils.getNtpOffset()).to.equal(0);
-                expect(parseInt(LocalStorage.getItem('hawk_ntp_offset'))).to.equal(0);
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-                expect(req.authorization).to.exist;
-
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    expect(artifacts.ext).to.equal('some-app-data');
-                    done();
-                });
-            });
-        });
-    });
-
-    it('should generate a header then fails to parse it (missing server header hash)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(false);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (with hash)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it then validate payload', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload('hola!', credentials, artifacts)).to.be.true;
-                expect(Hawk.server.authenticatePayload('hello!', credentials, artifacts)).to.be.false;
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (app)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (app, dlg)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-                expect(artifacts.dlg).to.equal('23434szr3q4d');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then fail authentication due to bad hash', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Bad payload hash');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header for one resource then fail to authenticate another', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-            req.url = '/something/else';
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(credentials).to.exist;
-                done();
-            });
-        });
-    });
-
-    describe('client', function () {
-
-        describe('#header', function () {
-
-            it('should return a valid authorization header (sha1)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha1'
-                };
-
-                var header = Browser.client.header('http://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="bsvY3IfUllw6V5rvk4tStEvpBhE=", ext="Bazinga!", mac="qbf1ZPG/r/e06F4ht+T77LXi5vw="');
-                done();
-            });
-
-            it('should return a valid authorization header (sha256)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", ext="Bazinga!", mac="q1CwFoSHzPZSkbIvl0oYlD+91rBUEvFk763nMjMndj8="');
-                done();
-            });
-
-            it('should return a valid authorization header (no ext)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", mac="HTgtd0jPI6E4izx8e4OHdO36q00xFCU0FolNq3RiCYs="');
-                done();
-            });
-
-            it('should return an empty authorization header on missing options', function (done) {
-
-                var header = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST').field;
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid credentials', function (done) {
-
-                var credentials = {
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207 }).field;
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid algorithm', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'hmac-sha-0'
-                };
-
-                var header = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, payload: 'something, anything!', ext: 'Bazinga!', timestamp: 1353809207 }).field;
-                expect(header).to.equal('');
-                done();
-            });
-        });
-
-        describe('#authenticate', function () {
-
-            it('should return false on invalid header', function (done) {
-
-                var res = {
-                    headers: {
-                        'server-authorization': 'Hawk mac="abc", bad="xyz"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, {})).to.equal(false);
-                done();
-            });
-
-            it('should return false on invalid mac', function (done) {
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="_IJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                var artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(false);
-                done();
-            });
-
-            it('should return true on ignoring hash', function (done) {
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="XIJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                var artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                done();
-            });
-
-            it('should fail on invalid WWW-Authenticate header format', function (done) {
-
-                var res = {
-                    headers: {
-                        'www-authenticate': 'Hawk ts="1362346425875", tsm="PhwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", x="Stale timestamp"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, {})).to.equal(false);
-                done();
-            });
-
-            it('should fail on invalid WWW-Authenticate header format', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                var res = {
-                    headers: {
-                        'www-authenticate': 'Hawk ts="1362346425875", tsm="hwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", error="Stale timestamp"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, credentials)).to.equal(false);
-                done();
-            });
-        });
-    });
-
-    describe('#parseAuthorizationHeader', function (done) {
-
-        it('returns null on missing header', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader()).to.equal(null);
-            done();
-        });
-
-        it('returns null on bad header syntax (structure)', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader('Hawk')).to.equal(null);
-            done();
-        });
-
-        it('returns null on bad header syntax (parts)', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader(' ')).to.equal(null);
-            done();
-        });
-
-        it('returns null on bad scheme name', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader('Basic asdasd')).to.equal(null);
-            done();
-        });
-
-        it('returns null on bad attribute value', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader('Hawk test="\t"', ['test'])).to.equal(null);
-            done();
-        });
-
-        it('returns null on duplicated attribute', function (done) {
-
-            expect(Browser.utils.parseAuthorizationHeader('Hawk test="a", test="b"', ['test'])).to.equal(null);
-            done();
-        });
-    });
-});
diff --git a/node_modules/request/node_modules/hawk/test/client.js b/node_modules/request/node_modules/hawk/test/client.js
deleted file mode 100755
index bcc4222a0f..0000000000
--- a/node_modules/request/node_modules/hawk/test/client.js
+++ /dev/null
@@ -1,206 +0,0 @@
-// Load modules
-
-var Url = require('url');
-var Lab = require('lab');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('client', function () {
-
-        describe('#header', function () {
-
-            it('should return a valid authorization header (sha1)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha1'
-                };
-
-                var header = Hawk.client.header('http://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="bsvY3IfUllw6V5rvk4tStEvpBhE=", ext="Bazinga!", mac="qbf1ZPG/r/e06F4ht+T77LXi5vw="');
-                done();
-            });
-
-            it('should return a valid authorization header (sha256)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Hawk.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", ext="Bazinga!", mac="q1CwFoSHzPZSkbIvl0oYlD+91rBUEvFk763nMjMndj8="');
-                done();
-            });
-
-            it('should return a valid authorization header (no ext)', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Hawk.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' }).field;
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", mac="HTgtd0jPI6E4izx8e4OHdO36q00xFCU0FolNq3RiCYs="');
-                done();
-            });
-
-            it('should return an empty authorization header on missing options', function (done) {
-
-                var header = Hawk.client.header('https://example.net/somewhere/over/the/rainbow', 'POST').field;
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid credentials', function (done) {
-
-                var credentials = {
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                var header = Hawk.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, ext: 'Bazinga!', timestamp: 1353809207 }).field;
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid algorithm', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'hmac-sha-0'
-                };
-
-                var header = Hawk.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials: credentials, payload: 'something, anything!', ext: 'Bazinga!', timestamp: 1353809207 }).field;
-                expect(header).to.equal('');
-                done();
-            });
-        });
-
-        describe('#authenticate', function () {
-
-            it('should return false on invalid header', function (done) {
-
-                var res = {
-                    headers: {
-                        'server-authorization': 'Hawk mac="abc", bad="xyz"'
-                    }
-                };
-
-                expect(Hawk.client.authenticate(res, {})).to.equal(false);
-                done();
-            });
-
-            it('should return false on invalid mac', function (done) {
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="_IJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    }
-                };
-
-                var artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Hawk.client.authenticate(res, credentials, artifacts)).to.equal(false);
-                done();
-            });
-
-            it('should return true on ignoring hash', function (done) {
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="XIJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    }
-                };
-
-                var artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Hawk.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                done();
-            });
-
-            it('should fail on invalid WWW-Authenticate header format', function (done) {
-
-                var header = 'Hawk ts="1362346425875", tsm="PhwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", x="Stale timestamp"';
-                expect(Hawk.client.authenticate({ headers: { 'www-authenticate': header } }, {})).to.equal(false);
-                done();
-            });
-
-            it('should fail on invalid WWW-Authenticate header format', function (done) {
-
-                var credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                var header = 'Hawk ts="1362346425875", tsm="hwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", error="Stale timestamp"';
-                expect(Hawk.client.authenticate({ headers: { 'www-authenticate': header } }, credentials)).to.equal(false);
-                done();
-            });
-        });
-    });
-});
diff --git a/node_modules/request/node_modules/hawk/test/crypto.js b/node_modules/request/node_modules/hawk/test/crypto.js
deleted file mode 100755
index b62c2177e3..0000000000
--- a/node_modules/request/node_modules/hawk/test/crypto.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('Crypto', function () {
-
-        describe('#generateNormalizedString', function () {
-
-            it('should return a valid normalized string', function (done) {
-
-                expect(Hawk.crypto.generateNormalizedString('header', {
-                    credentials: {
-                        key: 'dasdfasdf',
-                        algorithm: 'sha256'
-                    },
-                    ts: 1357747017,
-                    nonce: 'k3k4j5',
-                    method: 'GET',
-                    resource: '/resource/something',
-                    host: 'example.com',
-                    port: 8080
-                })).to.equal('hawk.1.header\n1357747017\nk3k4j5\nGET\n/resource/something\nexample.com\n8080\n\n\n');
-
-                done();
-            });
-
-            it('should return a valid normalized string (ext)', function (done) {
-
-                expect(Hawk.crypto.generateNormalizedString('header', {
-                    credentials: {
-                        key: 'dasdfasdf',
-                        algorithm: 'sha256'
-                    },
-                    ts: 1357747017,
-                    nonce: 'k3k4j5',
-                    method: 'GET',
-                    resource: '/resource/something',
-                    host: 'example.com',
-                    port: 8080,
-                    ext: 'this is some app data'
-                })).to.equal('hawk.1.header\n1357747017\nk3k4j5\nGET\n/resource/something\nexample.com\n8080\n\nthis is some app data\n');
-
-                done();
-            });
-
-            it('should return a valid normalized string (payload + ext)', function (done) {
-
-                expect(Hawk.crypto.generateNormalizedString('header', {
-                    credentials: {
-                        key: 'dasdfasdf',
-                        algorithm: 'sha256'
-                    },
-                    ts: 1357747017,
-                    nonce: 'k3k4j5',
-                    method: 'GET',
-                    resource: '/resource/something',
-                    host: 'example.com',
-                    port: 8080,
-                    hash: 'U4MKKSmiVxk37JCCrAVIjV/OhB3y+NdwoCr6RShbVkE=',
-                    ext: 'this is some app data'
-                })).to.equal('hawk.1.header\n1357747017\nk3k4j5\nGET\n/resource/something\nexample.com\n8080\nU4MKKSmiVxk37JCCrAVIjV/OhB3y+NdwoCr6RShbVkE=\nthis is some app data\n');
-
-                done();
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/test/index.js b/node_modules/request/node_modules/hawk/test/index.js
deleted file mode 100755
index ba837388a5..0000000000
--- a/node_modules/request/node_modules/hawk/test/index.js
+++ /dev/null
@@ -1,316 +0,0 @@
-// Load modules
-
-var Url = require('url');
-var Lab = require('lab');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    var credentialsFunc = function (id, callback) {
-
-        var credentials = {
-            id: id,
-            key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-            algorithm: (id === '1' ? 'sha1' : 'sha256'),
-            user: 'steve'
-        };
-
-        return callback(null, credentials);
-    };
-
-    it('should generate a header then successfully parse it (configuration)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header(Url.parse('http://example.com:8080/resource/4?filter=a'), req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-            expect(req.authorization).to.exist;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (node request)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Hawk.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(true);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (no server header options)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Hawk.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then fails to parse it (missing server header hash)', function (done) {
-
-        var req = {
-            method: 'POST',
-            url: '/resource/4?filter=a',
-            headers: {
-                host: 'example.com:8080',
-                'content-type': 'text/plain;x=y'
-            }
-        };
-
-        var payload = 'some not so random text';
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            var reqHeader = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', payload: payload, contentType: req.headers['content-type'] });
-            req.headers.authorization = reqHeader.field;
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload(payload, credentials, artifacts, req.headers['content-type'])).to.equal(true);
-
-                var res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials, artifacts);
-                expect(res.headers['server-authorization']).to.exist;
-
-                expect(Hawk.client.authenticate(res, credentials, artifacts, { payload: 'some reply' })).to.equal(false);
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (with hash)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it then validate payload', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(Hawk.server.authenticatePayload('hola!', credentials, artifacts)).to.be.true;
-                expect(Hawk.server.authenticatePayload('hello!', credentials, artifacts)).to.be.false;
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (app)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then successfully parse it (app, dlg)', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-                expect(artifacts.dlg).to.equal('23434szr3q4d');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header then fail authentication due to bad hash', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, payload: 'hola!', ext: 'some-app-data' }).field;
-            Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' }, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Bad payload hash');
-                done();
-            });
-        });
-    });
-
-    it('should generate a header for one resource then fail to authenticate another', function (done) {
-
-        var req = {
-            method: 'GET',
-            url: '/resource/4?filter=a',
-            host: 'example.com',
-            port: 8080
-        };
-
-        credentialsFunc('123456', function (err, credentials) {
-
-            req.authorization = Hawk.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials, ext: 'some-app-data' }).field;
-            req.url = '/something/else';
-
-            Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                expect(err).to.exist;
-                expect(credentials).to.exist;
-                done();
-            });
-        });
-    });
-});
diff --git a/node_modules/request/node_modules/hawk/test/readme.js b/node_modules/request/node_modules/hawk/test/readme.js
deleted file mode 100755
index f39e033d92..0000000000
--- a/node_modules/request/node_modules/hawk/test/readme.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hoek = require('hoek');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('README', function () {
-
-        describe('core', function () {
-
-            var credentials = {
-                id: 'dh37fgj492je',
-                key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                algorithm: 'sha256'
-            };
-
-            var options = {
-                credentials: credentials,
-                timestamp: 1353832234,
-                nonce: 'j4h3g2',
-                ext: 'some-app-ext-data'
-            };
-
-            it('should generate a header protocol example', function (done) {
-
-                var header = Hawk.client.header('http://example.com:8000/resource/1?b=1&a=2', 'GET', options).field;
-
-                expect(header).to.equal('Hawk id="dh37fgj492je", ts="1353832234", nonce="j4h3g2", ext="some-app-ext-data", mac="6R4rV5iE+NPoym+WwjeHzjAGXUtLNIxmo1vpMofpLAE="');
-                done();
-            });
-
-            it('should generate a normalized string protocol example', function (done) {
-
-                var normalized = Hawk.crypto.generateNormalizedString('header', {
-                    credentials: credentials,
-                    ts: options.timestamp,
-                    nonce: options.nonce,
-                    method: 'GET',
-                    resource: '/resource?a=1&b=2',
-                    host: 'example.com',
-                    port: 8000,
-                    ext: options.ext
-                });
-
-                expect(normalized).to.equal('hawk.1.header\n1353832234\nj4h3g2\nGET\n/resource?a=1&b=2\nexample.com\n8000\n\nsome-app-ext-data\n');
-                done();
-            });
-
-            var payloadOptions = Hoek.clone(options);
-            payloadOptions.payload = 'Thank you for flying Hawk';
-            payloadOptions.contentType = 'text/plain';
-
-            it('should generate a header protocol example (with payload)', function (done) {
-
-                var header = Hawk.client.header('http://example.com:8000/resource/1?b=1&a=2', 'POST', payloadOptions).field;
-
-                expect(header).to.equal('Hawk id="dh37fgj492je", ts="1353832234", nonce="j4h3g2", hash="Yi9LfIIFRtBEPt74PVmbTF/xVAwPn7ub15ePICfgnuY=", ext="some-app-ext-data", mac="aSe1DERmZuRl3pI36/9BdZmnErTw3sNzOOAUlfeKjVw="');
-                done();
-            });
-
-            it('should generate a normalized string protocol example (with payload)', function (done) {
-
-                var normalized = Hawk.crypto.generateNormalizedString('header', {
-                    credentials: credentials,
-                    ts: options.timestamp,
-                    nonce: options.nonce,
-                    method: 'POST',
-                    resource: '/resource?a=1&b=2',
-                    host: 'example.com',
-                    port: 8000,
-                    hash: Hawk.crypto.calculatePayloadHash(payloadOptions.payload, credentials.algorithm, payloadOptions.contentType),
-                    ext: options.ext
-                });
-
-                expect(normalized).to.equal('hawk.1.header\n1353832234\nj4h3g2\nPOST\n/resource?a=1&b=2\nexample.com\n8000\nYi9LfIIFRtBEPt74PVmbTF/xVAwPn7ub15ePICfgnuY=\nsome-app-ext-data\n');
-                done();
-            });
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/test/server.js b/node_modules/request/node_modules/hawk/test/server.js
deleted file mode 100755
index 404674fb3f..0000000000
--- a/node_modules/request/node_modules/hawk/test/server.js
+++ /dev/null
@@ -1,648 +0,0 @@
-// Load modules
-
-var Url = require('url');
-var Lab = require('lab');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('server', function () {
-
-        var credentialsFunc = function (id, callback) {
-
-            var credentials = {
-                id: id,
-                key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                algorithm: (id === '1' ? 'sha1' : 'sha256'),
-                user: 'steve'
-            };
-
-            return callback(null, credentials);
-        };
-
-        describe('#authenticate', function () {
-
-            it('should parse a valid authentication header (sha1)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="1", ts="1353788437", nonce="k3j4h2", mac="zy79QQ5/EYFmQqutVnYb73gAc/U=", ext="hello"',
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    done();
-                });
-            });
-
-            it('should parse a valid authentication header (sha256)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/1?b=1&a=2',
-                    host: 'example.com',
-                    port: 8000,
-                    authorization: 'Hawk id="dh37fgj492je", ts="1353832234", nonce="j4h3g2", mac="m8r1rHbXN6NgO+KIIhjO7sFRyd78RNGVUwehe8Cp2dU=", ext="some-app-data"',
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353832234000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    done();
-                });
-            });
-
-            it('should parse a valid authentication header (POST with payload)', function (done) {
-
-                var req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123456", ts="1357926341", nonce="1AwuJD", hash="qAiXIVv+yjDATneWxZP2YCTa9aHRgQdnH9b3Wc+o3dg=", ext="some-app-data", mac="UeYcj5UoTVaAWXNvJfLVia7kU3VabxCqrccXP8sUGC4="',
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1357926341000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    done();
-                });
-            });
-
-            it('should fail on missing hash', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/1?b=1&a=2',
-                    host: 'example.com',
-                    port: 8000,
-                    authorization: 'Hawk id="dh37fgj492je", ts="1353832234", nonce="j4h3g2", mac="m8r1rHbXN6NgO+KIIhjO7sFRyd78RNGVUwehe8Cp2dU=", ext="some-app-data"',
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { payload: 'body', localtimeOffsetMsec: 1353832234000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Missing required payload hash');
-                    done();
-                });
-            });
-
-            it('should fail on a stale timestamp', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123456", ts="1362337299", nonce="UzmxSs", ext="some-app-data", mac="wnNUxchvvryMH2RxckTdZ/gY3ijzvccx4keVvELC61w="',
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Stale timestamp');
-                    var header = err.response.headers['WWW-Authenticate'];
-                    var ts = header.match(/^Hawk ts\=\"(\d+)\"\, tsm\=\"([^\"]+)\"\, error=\"Stale timestamp\"$/);
-                    var now = Hawk.utils.now();
-                    expect(parseInt(ts[1], 10) * 1000).to.be.within(now - 1000, now + 1000);
-
-                    var res = {
-                        headers: {
-                            'www-authenticate': header
-                        }
-                    };
-
-                    expect(Hawk.client.authenticate(res, credentials, artifacts)).to.equal(true);
-                    done();
-                });
-            });
-
-            it('should fail on a replay', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="bXx7a7p1h9QYQNZ8x7QhvDQym8ACgab4m3lVSFn4DBw=", ext="hello"',
-                };
-
-                var memoryCache = {};
-                var options = {
-                    localtimeOffsetMsec: 1353788437000 - Hawk.utils.now(),
-                    nonceFunc: function (nonce, ts, callback) {
-
-                        if (memoryCache[nonce]) {
-                            return callback(new Error());
-                        }
-
-                        memoryCache[nonce] = true;
-                        return callback();
-                    }
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials, artifacts) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-
-                    Hawk.server.authenticate(req, credentialsFunc, options, function (err, credentials, artifacts) {
-
-                        expect(err).to.exist;
-                        expect(err.response.payload.message).to.equal('Invalid nonce');
-                        done();
-                    });
-                });
-            });
-
-            it('should fail on an invalid authentication header: wrong scheme', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Basic asdasdasdasd'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.not.exist;
-                    done();
-                });
-            });
-
-            it('should fail on an invalid authentication header: no scheme', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: '!@#'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid header syntax');
-                    done();
-                });
-            });
-
-            it('should fail on an missing authorization header', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, {}, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.isMissing).to.equal(true);
-                    done();
-                });
-            });
-
-            it('should fail on an missing host header', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                    }
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid Host header');
-                    done();
-                });
-            });
-
-            it('should fail on an missing authorization attribute (id)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Missing attributes');
-                    done();
-                });
-            });
-
-            it('should fail on an missing authorization attribute (ts)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Missing attributes');
-                    done();
-                });
-            });
-
-            it('should fail on an missing authorization attribute (nonce)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Missing attributes');
-                    done();
-                });
-            });
-
-            it('should fail on an missing authorization attribute (mac)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Missing attributes');
-                    done();
-                });
-            });
-
-            it('should fail on an unknown authorization attribute', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", x="3", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Unknown attribute: x');
-                    done();
-                });
-            });
-
-            it('should fail on an bad authorization header format', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123\\", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Bad header format');
-                    done();
-                });
-            });
-
-            it('should fail on an bad authorization attribute value', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="\t", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Bad attribute value: id');
-                    done();
-                });
-            });
-
-            it('should fail on an empty authorization attribute value', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Bad attribute value: id');
-                    done();
-                });
-            });
-
-            it('should fail on duplicated authorization attribute key', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", id="456", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Duplicate attribute: id');
-                    done();
-                });
-            });
-
-            it('should fail on an invalid authorization header format', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk'
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid header syntax');
-                    done();
-                });
-            });
-
-            it('should fail on an bad host header (missing host)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: ':8080',
-                        authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                    }
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid Host header');
-                    done();
-                });
-            });
-
-            it('should fail on an bad host header (pad port)', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:something',
-                        authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                    }
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid Host header');
-                    done();
-                });
-            });
-
-            it('should fail on credentialsFunc error', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                var credentialsFunc = function (id, callback) {
-
-                    return callback(new Error('Unknown user'));
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.message).to.equal('Unknown user');
-                    done();
-                });
-            });
-
-            it('should fail on missing credentials', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                var credentialsFunc = function (id, callback) {
-
-                    return callback(null, null);
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Unknown credentials');
-                    done();
-                });
-            });
-
-            it('should fail on invalid credentials', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                var credentialsFunc = function (id, callback) {
-
-                    var credentials = {
-                        key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                        user: 'steve'
-                    };
-
-                    return callback(null, credentials);
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.message).to.equal('Invalid credentials');
-                    expect(err.response.payload.message).to.equal('An internal server error occurred');
-                    done();
-                });
-            });
-
-            it('should fail on unknown credentials algorithm', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcUyW6EEgUH4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                var credentialsFunc = function (id, callback) {
-
-                    var credentials = {
-                        key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                        algorithm: 'hmac-sha-0',
-                        user: 'steve'
-                    };
-
-                    return callback(null, credentials);
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.message).to.equal('Unknown algorithm');
-                    expect(err.response.payload.message).to.equal('An internal server error occurred');
-                    done();
-                });
-            });
-
-            it('should fail on unknown bad mac', function (done) {
-
-                var req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080,
-                    authorization: 'Hawk id="123", ts="1353788437", nonce="k3j4h2", mac="/qwS4UjfVWMcU4jlr7T/wuKe3dKijvTvSos=", ext="hello"'
-                };
-
-                var credentialsFunc = function (id, callback) {
-
-                    var credentials = {
-                        key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                        algorithm: 'sha256',
-                        user: 'steve'
-                    };
-
-                    return callback(null, credentials);
-                };
-
-                Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 1353788437000 - Hawk.utils.now() }, function (err, credentials, artifacts) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Bad mac');
-                    done();
-                });
-            });
-        });
-
-        describe('#header', function () {
-
-            it('should return an empty authorization header on missing options', function (done) {
-
-                var header = Hawk.server.header();
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on missing credentials', function (done) {
-
-                var header = Hawk.server.header(null, {});
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid credentials', function (done) {
-
-                var credentials = {
-                    key: '2983d45yun89q'
-                };
-
-                var header = Hawk.server.header(credentials);
-                expect(header).to.equal('');
-                done();
-            });
-
-            it('should return an empty authorization header on invalid algorithm', function (done) {
-
-                var artifacts = {
-                    id: '123456'
-                };
-
-                var credentials = {
-                    key: '2983d45yun89q',
-                    algorithm: 'hmac-sha-0'
-                };
-
-                var header = Hawk.server.header(credentials, artifacts);
-                expect(header).to.equal('');
-                done();
-            });
-        });
-    });
-});
diff --git a/node_modules/request/node_modules/hawk/test/uri.js b/node_modules/request/node_modules/hawk/test/uri.js
deleted file mode 100755
index 44ffd7fb08..0000000000
--- a/node_modules/request/node_modules/hawk/test/uri.js
+++ /dev/null
@@ -1,456 +0,0 @@
-// Load modules
-
-var Http = require('http');
-var Lab = require('lab');
-var Hawk = require('../lib');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('Uri', function () {
-
-        var credentialsFunc = function (id, callback) {
-
-            var credentials = {
-                id: id,
-                key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                algorithm: 'sha256',
-                user: 'steve'
-            };
-
-            return callback(null, credentials);
-        };
-
-        it('should generate a bewit then successfully authenticate it', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?a=1&b=2',
-                host: 'example.com',
-                port: 80
-            };
-
-            credentialsFunc('123456', function (err, credentials) {
-
-                var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
-                req.url += '&bewit=' + bewit;
-
-                Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    expect(attributes.ext).to.equal('some-app-data');
-                    done();
-                });
-            });
-        });
-
-        it('should generate a bewit then successfully authenticate it (no ext)', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?a=1&b=2',
-                host: 'example.com',
-                port: 80
-            };
-
-            credentialsFunc('123456', function (err, credentials) {
-
-                var bewit = Hawk.uri.getBewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials, ttlSec: 60 * 60 * 24 * 365 * 100 });
-                req.url += '&bewit=' + bewit;
-
-                Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                    expect(err).to.not.exist;
-                    expect(credentials.user).to.equal('steve');
-                    done();
-                });
-            });
-        });
-
-        it('should successfully authenticate a request (last param)', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?a=1&b=2&bewit=MTIzNDU2XDQ1MTE0ODQ2MjFcMzFjMmNkbUJFd1NJRVZDOVkva1NFb2c3d3YrdEVNWjZ3RXNmOGNHU2FXQT1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(attributes.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-
-        it('should successfully authenticate a request (first param)', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MTE0ODQ2MjFcMzFjMmNkbUJFd1NJRVZDOVkva1NFb2c3d3YrdEVNWjZ3RXNmOGNHU2FXQT1cc29tZS1hcHAtZGF0YQ&a=1&b=2',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(attributes.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-
-        it('should successfully authenticate a request (only param)', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MTE0ODQ2NDFcZm1CdkNWT3MvcElOTUUxSTIwbWhrejQ3UnBwTmo4Y1VrSHpQd3Q5OXJ1cz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.not.exist;
-                expect(credentials.user).to.equal('steve');
-                expect(attributes.ext).to.equal('some-app-data');
-                done();
-            });
-        });
-
-        it('should fail on multiple authentication', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MTE0ODQ2NDFcZm1CdkNWT3MvcElOTUUxSTIwbWhrejQ3UnBwTmo4Y1VrSHpQd3Q5OXJ1cz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080,
-                authorization: 'Basic asdasdasdasd'
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Multiple authentications');
-                done();
-            });
-        });
-
-        it('should fail on method other than GET', function (done) {
-
-            credentialsFunc('123456', function (err, credentials) {
-
-                var req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                var exp = Math.floor(Hawk.utils.now() / 1000) + 60;
-                var ext = 'some-app-data';
-                var mac = Hawk.crypto.calculateMac('bewit', credentials, {
-                    timestamp: exp,
-                    nonce: '',
-                    method: req.method,
-                    resource: req.url,
-                    host: req.host,
-                    port: req.port,
-                    ext: ext
-                });
-
-                var bewit = credentials.id + '\\' + exp + '\\' + mac + '\\' + ext;
-
-                req.url += '&bewit=' + Hawk.utils.base64urlEncode(bewit);
-
-                Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                    expect(err).to.exist;
-                    expect(err.response.payload.message).to.equal('Invalid method');
-                    done();
-                });
-            });
-        });
-
-        it('should fail on invalid host header', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                headers: {
-                    host: 'example.com:something'
-                }
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Invalid Host header');
-                done();
-            });
-        });
-
-        it('should fail on empty bewit', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Empty bewit');
-                expect(err.isMissing).to.not.exist;
-                done();
-            });
-        });
-
-        it('should fail on invalid bewit', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=*',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Invalid bewit encoding');
-                expect(err.isMissing).to.not.exist;
-                done();
-            });
-        });
-
-        it('should fail on missing bewit', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.not.exist;
-                expect(err.isMissing).to.equal(true);
-                done();
-            });
-        });
-
-        it('should fail on invalid bewit structure', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=abc',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Invalid bewit structure');
-                done();
-            });
-        });
-
-        it('should fail on empty bewit attribute', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=YVxcY1xk',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Missing bewit attributes');
-                done();
-            });
-        });
-
-        it('should fail on expired access', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?a=1&b=2&bewit=MTIzNDU2XDEzNTY0MTg1ODNcWk1wZlMwWU5KNHV0WHpOMmRucTRydEk3NXNXTjFjeWVITTcrL0tNZFdVQT1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, credentialsFunc, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Access expired');
-                done();
-            });
-        });
-
-        it('should fail on credentials function error', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, function (id, callback) { callback(Hawk.error.badRequest('Boom')); }, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Boom');
-                done();
-            });
-        });
-
-        it('should fail on null credentials function response', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, function (id, callback) { callback(null, null); }, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Unknown credentials');
-                done();
-            });
-        });
-
-        it('should fail on invalid credentials function response', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, function (id, callback) { callback(null, {}); }, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Invalid credentials');
-                done();
-            });
-        });
-
-        it('should fail on invalid credentials function response (unknown algorithm)', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, function (id, callback) { callback(null, { key: 'xxx', algorithm: 'xxx' }); }, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.message).to.equal('Unknown algorithm');
-                done();
-            });
-        });
-
-        it('should fail on expired access', function (done) {
-
-            var req = {
-                method: 'GET',
-                url: '/resource/4?bewit=MTIzNDU2XDQ1MDk5OTE3MTlcTUE2eWkwRWRwR0pEcWRwb0JkYVdvVDJrL0hDSzA1T0Y3MkhuZlVmVy96Zz1cc29tZS1hcHAtZGF0YQ',
-                host: 'example.com',
-                port: 8080
-            };
-
-            Hawk.uri.authenticate(req, function (id, callback) { callback(null, { key: 'xxx', algorithm: 'sha256' }); }, {}, function (err, credentials, attributes) {
-
-                expect(err).to.exist;
-                expect(err.response.payload.message).to.equal('Bad mac');
-                done();
-            });
-        });
-    });
-
-    describe('#getBewit', function () {
-
-        it('should return a valid bewit value', function (done) {
-
-            var credentials = {
-                id: '123456',
-                key: '2983d45yun89q',
-                algorithm: 'sha256'
-            };
-
-            var bewit = Hawk.uri.getBewit('https://example.com/somewhere/over/the/rainbow', { credentials: credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' });
-            expect(bewit).to.equal('MTIzNDU2XDEzNTY0MjA3MDdca3NjeHdOUjJ0SnBQMVQxekRMTlBiQjVVaUtJVTl0T1NKWFRVZEc3WDloOD1ceGFuZHlhbmR6');
-            done();
-        });
-
-        it('should return an empty bewit on invalid credentials', function (done) {
-
-            var credentials = {
-                key: '2983d45yun89q',
-                algorithm: 'sha256'
-            };
-
-            var bewit = Hawk.uri.getBewit('https://example.com/somewhere/over/the/rainbow', { credentials: credentials, ttlSec: 3000, ext: 'xandyandz' });
-            expect(bewit).to.equal('');
-            done();
-        });
-
-        it('should return an empty bewit on invalid algorithm', function (done) {
-
-            var credentials = {
-                id: '123456',
-                key: '2983d45yun89q',
-                algorithm: 'hmac-sha-0'
-            };
-
-            var bewit = Hawk.uri.getBewit('https://example.com/somewhere/over/the/rainbow', { credentials: credentials, ttlSec: 300, ext: 'xandyandz' });
-            expect(bewit).to.equal('');
-            done();
-        });
-
-        it('should return an empty bewit on missing options', function (done) {
-
-            var credentials = {
-                id: '123456',
-                key: '2983d45yun89q',
-                algorithm: 'hmac-sha-0'
-            };
-
-            var bewit = Hawk.uri.getBewit('https://example.com/somewhere/over/the/rainbow');
-            expect(bewit).to.equal('');
-            done();
-        });
-    });
-});
-
diff --git a/node_modules/request/node_modules/hawk/test/utils.js b/node_modules/request/node_modules/hawk/test/utils.js
deleted file mode 100755
index e6e6dfa409..0000000000
--- a/node_modules/request/node_modules/hawk/test/utils.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Load modules
-
-var Lab = require('lab');
-var Hawk = require('../lib');
-var Package = require('../package.json');
-
-
-// Declare internals
-
-var internals = {};
-
-
-// Test shortcuts
-
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
-
-
-describe('Hawk', function () {
-
-    describe('Utils', function () {
-
-        describe('#parseHost', function () {
-
-            it('returns port 80 for non tls node request', function (done) {
-
-                var req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                expect(Hawk.utils.parseHost(req, 'Host').port).to.equal(80);
-                done();
-            });
-
-            it('returns port 443 for non tls node request', function (done) {
-
-                var req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com',
-                        'content-type': 'text/plain;x=y'
-                    },
-                    connection: {
-                        encrypted: true
-                    }
-                };
-
-                expect(Hawk.utils.parseHost(req, 'Host').port).to.equal(443);
-                done();
-            });
-        });
-
-        describe('#version', function () {
-
-            it('returns the correct package version number', function (done) {
-
-                expect(Hawk.utils.version()).to.equal(Package.version);
-                done();
-            });
-        });
-
-        describe('#unauthorized', function () {
-
-            it('returns a hawk 401', function (done) {
-
-                expect(Hawk.utils.unauthorized('kaboom').response.headers['WWW-Authenticate']).to.equal('Hawk error="kaboom"');
-                done();
-            });
-        });
-    });
-});
-
-
diff --git a/node_modules/request/node_modules/json-stringify-safe/test.js b/node_modules/request/node_modules/json-stringify-safe/test.js
deleted file mode 100644
index 7f6a01cb7f..0000000000
--- a/node_modules/request/node_modules/json-stringify-safe/test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-var stringify = require('./stringify.js');
-
-var circularObj = { a: 'b' };
-circularObj.circularRef = circularObj;
-circularObj.list = [ circularObj, circularObj ];
-
-//////////
-// default
-var testObj = {
-  "a": "b",
-  "circularRef": "[Circular]",
-  "list": [
-    "[Circular]",
-    "[Circular]"
-  ]
-};
-
-var assert = require('assert');
-assert.equal(JSON.stringify(testObj, null, 2),
-             stringify(circularObj, null, 2));
-
-assert.equal(JSON.stringify(testObj, null, 2),
-            JSON.stringify(circularObj, stringify.getSerialize(), 2));
-
-
-////////
-// prune
-testObj = {
-  "a": "b",
-  "list": [
-    null,
-    null
-  ]
-};
-
-function prune(k, v) {}
-
-assert.equal(JSON.stringify(testObj, null, 2),
-             stringify(circularObj, null, 2, prune));
-
-///////////
-// re-cycle
-// (throws)
-function recycle(k, v) {
-  return v;
-}
-
-assert.throws(function() {
-  stringify(circularObj, null, 2, recycle);
-});
-
-////////
-// fancy
-testObj = {
-  "a": "b",
-  "circularRef": "circularRef{a:string,circularRef:Object,list:Array}",
-  "list": [
-    "0{a:string,circularRef:Object,list:Array}",
-    "1{a:string,circularRef:Object,list:Array}"
-  ]
-};
-
-function signer(key, value) {
-  var ret = key + '{';
-  var f = false;
-  for (var i in value) {
-    if (f)
-      ret += ',';
-    f = true;
-    ret += i + ':';
-    var v = value[i];
-    switch (typeof v) {
-      case 'object':
-        if (!v)
-          ret += 'null';
-        else if (Array.isArray(v))
-          ret += 'Array'
-        else
-          ret += v.constructor && v.constructor.name || 'Object';
-        break;
-      default:
-        ret += typeof v;
-        break;
-    }
-  }
-  ret += '}';
-  return ret;
-}
-
-assert.equal(JSON.stringify(testObj, null, 2),
-             stringify(circularObj, null, 2, signer));
-
-
-////////
-// pass!
-console.log('ok');
diff --git a/node_modules/request/node_modules/mime/test.js b/node_modules/request/node_modules/mime/test.js
deleted file mode 100644
index cbad034a18..0000000000
--- a/node_modules/request/node_modules/mime/test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Usage: node test.js
- */
-
-var mime = require('./mime');
-var assert = require('assert');
-
-function eq(a, b) {
-  console.log('Test: ' + a + ' === ' + b);
-  assert.strictEqual.apply(null, arguments);
-}
-
-console.log(Object.keys(mime.extensions).length + ' types');
-console.log(Object.keys(mime.types).length + ' extensions\n');
-
-//
-// Test mime lookups
-//
-
-eq('text/plain', mime.lookup('text.txt'));
-eq('text/plain', mime.lookup('.text.txt'));
-eq('text/plain', mime.lookup('.txt'));
-eq('text/plain', mime.lookup('txt'));
-eq('application/octet-stream', mime.lookup('text.nope'));
-eq('fallback', mime.lookup('text.fallback', 'fallback'));
-eq('application/octet-stream', mime.lookup('constructor'));
-eq('text/plain', mime.lookup('TEXT.TXT'));
-eq('text/event-stream', mime.lookup('text/event-stream'));
-eq('application/x-web-app-manifest+json', mime.lookup('text.webapp'));
-
-//
-// Test extensions
-//
-
-eq('txt', mime.extension(mime.types.text));
-eq('html', mime.extension(mime.types.htm));
-eq('bin', mime.extension('application/octet-stream'));
-eq(undefined, mime.extension('constructor'));
-
-//
-// Test node types
-//
-
-eq('application/octet-stream', mime.lookup('file.buffer'));
-eq('audio/mp4', mime.lookup('file.m4a'));
-
-//
-// Test charsets
-//
-
-eq('UTF-8', mime.charsets.lookup('text/plain'));
-eq(undefined, mime.charsets.lookup(mime.types.js));
-eq('fallback', mime.charsets.lookup('application/octet-stream', 'fallback'));
-
-console.log('\nOK');
diff --git a/node_modules/request/node_modules/node-uuid/test/compare_v1.js b/node_modules/request/node_modules/node-uuid/test/compare_v1.js
deleted file mode 100644
index 05af82215f..0000000000
--- a/node_modules/request/node_modules/node-uuid/test/compare_v1.js
+++ /dev/null
@@ -1,63 +0,0 @@
-var assert = require('assert'),
-    nodeuuid = require('../uuid'),
-    uuidjs = require('uuid-js'),
-    libuuid = require('uuid').generate,
-    util = require('util'),
-    exec = require('child_process').exec,
-    os = require('os');
-
-// On Mac Os X / macports there's only the ossp-uuid package that provides uuid
-// On Linux there's uuid-runtime which provides uuidgen
-var uuidCmd = os.type() === 'Darwin' ? 'uuid -1' : 'uuidgen -t';
-
-function compare(ids) {
-  console.log(ids);
-  for (var i = 0; i < ids.length; i++) {
-    var id = ids[i].split('-');
-    id = [id[2], id[1], id[0]].join('');
-    ids[i] = id;
-  }
-  var sorted = ([].concat(ids)).sort();
-
-  if (sorted.toString() !== ids.toString()) {
-    console.log('Warning: sorted !== ids');
-  } else {
-    console.log('everything in order!');
-  }
-}
-
-// Test time order of v1 uuids
-var ids = [];
-while (ids.length < 10e3) ids.push(nodeuuid.v1());
-
-var max = 10;
-console.log('node-uuid:');
-ids = [];
-for (var i = 0; i < max; i++) ids.push(nodeuuid.v1());
-compare(ids);
-
-console.log('');
-console.log('uuidjs:');
-ids = [];
-for (var i = 0; i < max; i++) ids.push(uuidjs.create(1).toString());
-compare(ids);
-
-console.log('');
-console.log('libuuid:');
-ids = [];
-var count = 0;
-var last = function() {
-  compare(ids);
-}
-var cb = function(err, stdout, stderr) {
-  ids.push(stdout.substring(0, stdout.length-1));
-  count++;
-  if (count < max) {
-    return next();
-  }
-  last();
-};
-var next = function() {
-  exec(uuidCmd, cb);
-};
-next();
diff --git a/node_modules/request/node_modules/node-uuid/test/test.html b/node_modules/request/node_modules/node-uuid/test/test.html
deleted file mode 100644
index d80326ec5a..0000000000
--- a/node_modules/request/node_modules/node-uuid/test/test.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <head>
-    <style>
-      div {
-        font-family: monospace;
-        font-size: 8pt;
-      }
-      div.log {color: #444;}
-      div.warn {color: #550;}
-      div.error {color: #800; font-weight: bold;}
-    </style>
-    <script src="../uuid.js"></script>
-  </head>
-  <body>
-    <script src="./test.js"></script>
-  </body>
-</html>
diff --git a/node_modules/request/node_modules/node-uuid/test/test.js b/node_modules/request/node_modules/node-uuid/test/test.js
deleted file mode 100644
index 2469225616..0000000000
--- a/node_modules/request/node_modules/node-uuid/test/test.js
+++ /dev/null
@@ -1,228 +0,0 @@
-if (!this.uuid) {
-  // node.js
-  uuid = require('../uuid');
-}
-
-//
-// x-platform log/assert shims
-//
-
-function _log(msg, type) {
-  type = type || 'log';
-
-  if (typeof(document) != 'undefined') {
-    document.write('<div class="' + type + '">' + msg.replace(/\n/g, '<br />') + '</div>');
-  }
-  if (typeof(console) != 'undefined') {
-    var color = {
-      log: '\033[39m',
-      warn: '\033[33m',
-      error: '\033[31m'
-    };
-    console[type](color[type] + msg + color.log);
-  }
-}
-
-function log(msg) {_log(msg, 'log');}
-function warn(msg) {_log(msg, 'warn');}
-function error(msg) {_log(msg, 'error');}
-
-function assert(res, msg) {
-  if (!res) {
-    error('FAIL: ' + msg);
-  } else {
-    log('Pass: ' + msg);
-  }
-}
-
-//
-// Unit tests
-//
-
-// Verify ordering of v1 ids created with explicit times
-var TIME = 1321644961388; // 2011-11-18 11:36:01.388-08:00
-
-function compare(name, ids) {
-  ids = ids.map(function(id) {
-    return id.split('-').reverse().join('-');
-  }).sort();
-  var sorted = ([].concat(ids)).sort();
-
-  assert(sorted.toString() == ids.toString(), name + ' have expected order');
-}
-
-// Verify ordering of v1 ids created using default behavior
-compare('uuids with current time', [
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1(),
-  uuid.v1()
-]);
-
-// Verify ordering of v1 ids created with explicit times
-compare('uuids with time option', [
-  uuid.v1({msecs: TIME - 10*3600*1000}),
-  uuid.v1({msecs: TIME - 1}),
-  uuid.v1({msecs: TIME}),
-  uuid.v1({msecs: TIME + 1}),
-  uuid.v1({msecs: TIME + 28*24*3600*1000})
-]);
-
-assert(
-  uuid.v1({msecs: TIME}) != uuid.v1({msecs: TIME}),
-  'IDs created at same msec are different'
-);
-
-// Verify throw if too many ids created
-var thrown = false;
-try {
-  uuid.v1({msecs: TIME, nsecs: 10000});
-} catch (e) {
-  thrown = true;
-}
-assert(thrown, 'Exception thrown when > 10K ids created in 1 ms');
-
-// Verify clock regression bumps clockseq
-var uidt = uuid.v1({msecs: TIME});
-var uidtb = uuid.v1({msecs: TIME - 1});
-assert(
-  parseInt(uidtb.split('-')[3], 16) - parseInt(uidt.split('-')[3], 16) === 1,
-  'Clock regression by msec increments the clockseq'
-);
-
-// Verify clock regression bumps clockseq
-var uidtn = uuid.v1({msecs: TIME, nsecs: 10});
-var uidtnb = uuid.v1({msecs: TIME, nsecs: 9});
-assert(
-  parseInt(uidtnb.split('-')[3], 16) - parseInt(uidtn.split('-')[3], 16) === 1,
-  'Clock regression by nsec increments the clockseq'
-);
-
-// Verify explicit options produce expected id
-var id = uuid.v1({
-  msecs: 1321651533573,
-  nsecs: 5432,
-  clockseq: 0x385c,
-  node: [ 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10 ]
-});
-assert(id == 'd9428888-122b-11e1-b85c-61cd3cbb3210', 'Explicit options produce expected id');
-
-// Verify adjacent ids across a msec boundary are 1 time unit apart
-var u0 = uuid.v1({msecs: TIME, nsecs: 9999});
-var u1 = uuid.v1({msecs: TIME + 1, nsecs: 0});
-
-var before = u0.split('-')[0], after = u1.split('-')[0];
-var dt = parseInt(after, 16) - parseInt(before, 16);
-assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart');
-
-//
-// Test parse/unparse
-//
-
-id = '00112233445566778899aabbccddeeff';
-assert(uuid.unparse(uuid.parse(id.substr(0,10))) ==
-  '00112233-4400-0000-0000-000000000000', 'Short parse');
-assert(uuid.unparse(uuid.parse('(this is the uuid -> ' + id + id)) ==
-  '00112233-4455-6677-8899-aabbccddeeff', 'Dirty parse');
-
-//
-// Perf tests
-//
-
-var generators = {
-  v1: uuid.v1,
-  v4: uuid.v4
-};
-
-var UUID_FORMAT = {
-  v1: /[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i,
-  v4: /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i
-};
-
-var N = 1e4;
-
-// Get %'age an actual value differs from the ideal value
-function divergence(actual, ideal) {
-  return Math.round(100*100*(actual - ideal)/ideal)/100;
-}
-
-function rate(msg, t) {
-  log(msg + ': ' + (N / (Date.now() - t) * 1e3 | 0) + ' uuids\/second');
-}
-
-for (var version in generators) {
-  var counts = {}, max = 0;
-  var generator = generators[version];
-  var format = UUID_FORMAT[version];
-
-  log('\nSanity check ' + N + ' ' + version + ' uuids');
-  for (var i = 0, ok = 0; i < N; i++) {
-    id = generator();
-    if (!format.test(id)) {
-      throw Error(id + ' is not a valid UUID string');
-    }
-
-    if (id != uuid.unparse(uuid.parse(id))) {
-      assert(fail, id + ' is not a valid id');
-    }
-
-    // Count digits for our randomness check
-    if (version == 'v4') {
-      var digits = id.replace(/-/g, '').split('');
-      for (var j = digits.length-1; j >= 0; j--) {
-        var c = digits[j];
-        max = Math.max(max, counts[c] = (counts[c] || 0) + 1);
-      }
-    }
-  }
-
-  // Check randomness for v4 UUIDs
-  if (version == 'v4') {
-    // Limit that we get worried about randomness. (Purely empirical choice, this!)
-    var limit = 2*100*Math.sqrt(1/N);
-
-    log('\nChecking v4 randomness.  Distribution of Hex Digits (% deviation from ideal)');
-
-    for (var i = 0; i < 16; i++) {
-      var c = i.toString(16);
-      var bar = '', n = counts[c], p = Math.round(n/max*100|0);
-
-      // 1-3,5-8, and D-F: 1:16 odds over 30 digits
-      var ideal = N*30/16;
-      if (i == 4) {
-        // 4: 1:1 odds on 1 digit, plus 1:16 odds on 30 digits
-        ideal = N*(1 + 30/16);
-      } else if (i >= 8 && i <= 11) {
-        // 8-B: 1:4 odds on 1 digit, plus 1:16 odds on 30 digits
-        ideal = N*(1/4 + 30/16);
-      } else {
-        // Otherwise: 1:16 odds on 30 digits
-        ideal = N*30/16;
-      }
-      var d = divergence(n, ideal);
-
-      // Draw bar using UTF squares (just for grins)
-      var s = n/max*50 | 0;
-      while (s--) bar += '=';
-
-      assert(Math.abs(d) < limit, c + ' |' + bar + '| ' + counts[c] + ' (' + d + '% < ' + limit + '%)');
-    }
-  }
-}
-
-// Perf tests
-for (var version in generators) {
-  log('\nPerformance testing ' + version + ' UUIDs');
-  var generator = generators[version];
-  var buf = new uuid.BufferClass(16);
-
-  for (var i = 0, t = Date.now(); i < N; i++) generator();
-  rate('uuid.' + version + '()', t);
-
-  for (var i = 0, t = Date.now(); i < N; i++) generator('binary');
-  rate('uuid.' + version + '(\'binary\')', t);
-
-  for (var i = 0, t = Date.now(); i < N; i++) generator('binary', buf);
-  rate('uuid.' + version + '(\'binary\', buffer)', t);
-}
diff --git a/node_modules/request/node_modules/oauth-sign/test.js b/node_modules/request/node_modules/oauth-sign/test.js
deleted file mode 100644
index 46955ff693..0000000000
--- a/node_modules/request/node_modules/oauth-sign/test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var hmacsign = require('./index').hmacsign
-  , assert = require('assert')
-  , qs = require('querystring')
-  ;
-
-// Tests from Twitter documentation https://dev.twitter.com/docs/auth/oauth
-
-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'
-  , oauth_signature_method: 'HMAC-SHA1'
-  , oauth_timestamp: '1272323042'
-  , oauth_version: '1.0'
-  }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98")
-
-console.log(reqsign)
-console.log('8wUi7m5HFQy76nowoCThusfgB+Q=')
-assert.equal(reqsign, '8wUi7m5HFQy76nowoCThusfgB+Q=')
-
-var accsign = hmacsign('POST', 'https://api.twitter.com/oauth/access_token',
-  { oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g'
-  , oauth_nonce: '9zWH6qe0qG7Lc1telCn7FhUbLyVdjEaL3MO5uHxn8'
-  , oauth_signature_method: 'HMAC-SHA1'
-  , oauth_token: '8ldIZyxQeVrFZXFOZH5tAwj6vzJYuLQpl0WUEYtWc'
-  , oauth_timestamp: '1272323047'
-  , 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', 
-  { oauth_consumer_key: "GDdmIQH6jhtmLUypg82g"
-  , oauth_nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y"
-  , oauth_signature_method: "HMAC-SHA1"
-  , oauth_token: "819797-Jxq8aYUDRmykzVKrgoLhXSq67TEa5ruc4GJC2rWimw"
-  , oauth_timestamp: "1272325550"
-  , oauth_version: "1.0"
-  , status: 'setting up my twitter 私のさえずりを設定する'
-  }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "J6zix3FfA9LofH0awS24M3HcBYXO5nI1iYe8EfBA")
-
-console.log(upsign)
-console.log('yOahq5m0YjDDjfjxHaXEsW9D+X0=')
-assert.equal(upsign, 'yOahq5m0YjDDjfjxHaXEsW9D+X0=')
-
-
diff --git a/node_modules/rimraf/test/run.sh b/node_modules/rimraf/test/run.sh
deleted file mode 100644
index 598f0163b2..0000000000
--- a/node_modules/rimraf/test/run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-for i in test-*.js; do
-  echo -n $i ...
-  bash setup.sh
-  node $i
-  ! [ -d target ]
-  echo "pass"
-done
-rm -rf target
diff --git a/node_modules/rimraf/test/setup.sh b/node_modules/rimraf/test/setup.sh
deleted file mode 100644
index 2602e63160..0000000000
--- a/node_modules/rimraf/test/setup.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-set -e
-
-files=10
-folders=2
-depth=4
-target="$PWD/target"
-
-rm -rf target
-
-fill () {
-  local depth=$1
-  local files=$2
-  local folders=$3
-  local target=$4
-
-  if ! [ -d $target ]; then
-    mkdir -p $target
-  fi
-
-  local f
-
-  f=$files
-  while [ $f -gt 0 ]; do
-    touch "$target/f-$depth-$f"
-    let f--
-  done
-
-  let depth--
-
-  if [ $depth -le 0 ]; then
-    return 0
-  fi
-
-  f=$folders
-  while [ $f -gt 0 ]; do
-    mkdir "$target/folder-$depth-$f"
-    fill $depth $files $folders "$target/d-$depth-$f"
-    let f--
-  done
-}
-
-fill $depth $files $folders $target
-
-# sanity assert
-[ -d $target ]
diff --git a/node_modules/rimraf/test/test-async.js b/node_modules/rimraf/test/test-async.js
deleted file mode 100644
index 9c2e0b7be0..0000000000
--- a/node_modules/rimraf/test/test-async.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var rimraf = require("../rimraf")
-  , path = require("path")
-rimraf(path.join(__dirname, "target"), function (er) {
-  if (er) throw er
-})
diff --git a/node_modules/rimraf/test/test-sync.js b/node_modules/rimraf/test/test-sync.js
deleted file mode 100644
index eb71f10476..0000000000
--- a/node_modules/rimraf/test/test-sync.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var rimraf = require("../rimraf")
-  , path = require("path")
-rimraf.sync(path.join(__dirname, "target"))
diff --git a/node_modules/semver/test/amd.js b/node_modules/semver/test/amd.js
deleted file mode 100644
index a6041341b3..0000000000
--- a/node_modules/semver/test/amd.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-
-test('amd', function(t) {
-  global.define = define;
-  define.amd = true;
-  var defined = null;
-  function define(stuff) {
-    defined = stuff;
-  }
-  var fromRequire = require('../');
-  t.ok(defined, 'amd function called');
-  t.equal(fromRequire, defined, 'amd stuff same as require stuff');
-  t.end();
-});
diff --git a/node_modules/semver/test/index.js b/node_modules/semver/test/index.js
deleted file mode 100644
index 5b488b2f84..0000000000
--- a/node_modules/semver/test/index.js
+++ /dev/null
@@ -1,556 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-var semver = require('../semver.js');
-var eq = semver.eq;
-var gt = semver.gt;
-var lt = semver.lt;
-var neq = semver.neq;
-var cmp = semver.cmp;
-var gte = semver.gte;
-var lte = semver.lte;
-var satisfies = semver.satisfies;
-var validRange = semver.validRange;
-var inc = semver.inc;
-var replaceStars = semver.replaceStars;
-var toComparators = semver.toComparators;
-var SemVer = semver.SemVer;
-var Range = semver.Range;
-
-test('\ncomparison tests', function(t) {
-  // [version1, version2]
-  // version1 should be greater than version2
-  [['0.0.0', '0.0.0-foo'],
-    ['0.0.1', '0.0.0'],
-    ['1.0.0', '0.9.9'],
-    ['0.10.0', '0.9.0'],
-    ['0.99.0', '0.10.0'],
-    ['2.0.0', '1.2.3'],
-    ['v0.0.0', '0.0.0-foo', true],
-    ['v0.0.1', '0.0.0', true],
-    ['v1.0.0', '0.9.9', true],
-    ['v0.10.0', '0.9.0', true],
-    ['v0.99.0', '0.10.0', true],
-    ['v2.0.0', '1.2.3', true],
-    ['0.0.0', 'v0.0.0-foo', true],
-    ['0.0.1', 'v0.0.0', true],
-    ['1.0.0', 'v0.9.9', true],
-    ['0.10.0', 'v0.9.0', true],
-    ['0.99.0', 'v0.10.0', true],
-    ['2.0.0', 'v1.2.3', true],
-    ['1.2.3', '1.2.3-asdf'],
-    ['1.2.3', '1.2.3-4'],
-    ['1.2.3', '1.2.3-4-foo'],
-    ['1.2.3-5-foo', '1.2.3-5'],
-    ['1.2.3-5', '1.2.3-4'],
-    ['1.2.3-5-foo', '1.2.3-5-Foo'],
-    ['3.0.0', '2.7.2+asdf'],
-    ['1.2.3-a.10', '1.2.3-a.5'],
-    ['1.2.3-a.b', '1.2.3-a.5'],
-    ['1.2.3-a.b', '1.2.3-a'],
-    ['1.2.3-a.b.c.10.d.5', '1.2.3-a.b.c.5.d.100']
-  ].forEach(function(v) {
-    var v0 = v[0];
-    var v1 = v[1];
-    var loose = v[2];
-    t.ok(gt(v0, v1, loose), "gt('" + v0 + "', '" + v1 + "')");
-    t.ok(lt(v1, v0, loose), "lt('" + v1 + "', '" + v0 + "')");
-    t.ok(!gt(v1, v0, loose), "!gt('" + v1 + "', '" + v0 + "')");
-    t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')");
-    t.ok(eq(v0, v0, loose), "eq('" + v0 + "', '" + v0 + "')");
-    t.ok(eq(v1, v1, loose), "eq('" + v1 + "', '" + v1 + "')");
-    t.ok(neq(v0, v1, loose), "neq('" + v0 + "', '" + v1 + "')");
-    t.ok(cmp(v1, '==', v1, loose), "cmp('" + v1 + "' == '" + v1 + "')");
-    t.ok(cmp(v0, '>=', v1, loose), "cmp('" + v0 + "' >= '" + v1 + "')");
-    t.ok(cmp(v1, '<=', v0, loose), "cmp('" + v1 + "' <= '" + v0 + "')");
-    t.ok(cmp(v0, '!=', v1, loose), "cmp('" + v0 + "' != '" + v1 + "')");
-  });
-  t.end();
-});
-
-test('\nequality tests', function(t) {
-  // [version1, version2]
-  // version1 should be equivalent to version2
-  [['1.2.3', 'v1.2.3', true],
-    ['1.2.3', '=1.2.3', true],
-    ['1.2.3', 'v 1.2.3', true],
-    ['1.2.3', '= 1.2.3', true],
-    ['1.2.3', ' v1.2.3', true],
-    ['1.2.3', ' =1.2.3', true],
-    ['1.2.3', ' v 1.2.3', true],
-    ['1.2.3', ' = 1.2.3', true],
-    ['1.2.3-0', 'v1.2.3-0', true],
-    ['1.2.3-0', '=1.2.3-0', true],
-    ['1.2.3-0', 'v 1.2.3-0', true],
-    ['1.2.3-0', '= 1.2.3-0', true],
-    ['1.2.3-0', ' v1.2.3-0', true],
-    ['1.2.3-0', ' =1.2.3-0', true],
-    ['1.2.3-0', ' v 1.2.3-0', true],
-    ['1.2.3-0', ' = 1.2.3-0', true],
-    ['1.2.3-1', 'v1.2.3-1', true],
-    ['1.2.3-1', '=1.2.3-1', true],
-    ['1.2.3-1', 'v 1.2.3-1', true],
-    ['1.2.3-1', '= 1.2.3-1', true],
-    ['1.2.3-1', ' v1.2.3-1', true],
-    ['1.2.3-1', ' =1.2.3-1', true],
-    ['1.2.3-1', ' v 1.2.3-1', true],
-    ['1.2.3-1', ' = 1.2.3-1', true],
-    ['1.2.3-beta', 'v1.2.3-beta', true],
-    ['1.2.3-beta', '=1.2.3-beta', true],
-    ['1.2.3-beta', 'v 1.2.3-beta', true],
-    ['1.2.3-beta', '= 1.2.3-beta', true],
-    ['1.2.3-beta', ' v1.2.3-beta', true],
-    ['1.2.3-beta', ' =1.2.3-beta', true],
-    ['1.2.3-beta', ' v 1.2.3-beta', true],
-    ['1.2.3-beta', ' = 1.2.3-beta', true],
-    ['1.2.3-beta+build', ' = 1.2.3-beta+otherbuild', true],
-    ['1.2.3+build', ' = 1.2.3+otherbuild', true],
-    ['1.2.3-beta+build', '1.2.3-beta+otherbuild'],
-    ['1.2.3+build', '1.2.3+otherbuild'],
-    ['  v1.2.3+build', '1.2.3+otherbuild']
-  ].forEach(function(v) {
-    var v0 = v[0];
-    var v1 = v[1];
-    var loose = v[2];
-    t.ok(eq(v0, v1, loose), "eq('" + v0 + "', '" + v1 + "')");
-    t.ok(!neq(v0, v1, loose), "!neq('" + v0 + "', '" + v1 + "')");
-    t.ok(cmp(v0, '==', v1, loose), 'cmp(' + v0 + '==' + v1 + ')');
-    t.ok(!cmp(v0, '!=', v1, loose), '!cmp(' + v0 + '!=' + v1 + ')');
-    t.ok(!cmp(v0, '===', v1, loose), '!cmp(' + v0 + '===' + v1 + ')');
-    t.ok(cmp(v0, '!==', v1, loose), 'cmp(' + v0 + '!==' + v1 + ')');
-    t.ok(!gt(v0, v1, loose), "!gt('" + v0 + "', '" + v1 + "')");
-    t.ok(gte(v0, v1, loose), "gte('" + v0 + "', '" + v1 + "')");
-    t.ok(!lt(v0, v1, loose), "!lt('" + v0 + "', '" + v1 + "')");
-    t.ok(lte(v0, v1, loose), "lte('" + v0 + "', '" + v1 + "')");
-  });
-  t.end();
-});
-
-
-test('\nrange tests', function(t) {
-  // [range, version]
-  // version should be included by range
-  [['1.0.0 - 2.0.0', '1.2.3'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '0.2.4'],
-    ['', '1.0.0'],
-    ['*', '1.2.3'],
-    ['*', 'v1.2.3-foo', true],
-    ['>=1.0.0', '1.0.0'],
-    ['>=1.0.0', '1.0.1'],
-    ['>=1.0.0', '1.1.0'],
-    ['>1.0.0', '1.0.1'],
-    ['>1.0.0', '1.1.0'],
-    ['<=2.0.0', '2.0.0'],
-    ['<=2.0.0', '1.9999.9999'],
-    ['<=2.0.0', '0.2.9'],
-    ['<2.0.0', '1.9999.9999'],
-    ['<2.0.0', '0.2.9'],
-    ['>= 1.0.0', '1.0.0'],
-    ['>=  1.0.0', '1.0.1'],
-    ['>=   1.0.0', '1.1.0'],
-    ['> 1.0.0', '1.0.1'],
-    ['>  1.0.0', '1.1.0'],
-    ['<=   2.0.0', '2.0.0'],
-    ['<= 2.0.0', '1.9999.9999'],
-    ['<=  2.0.0', '0.2.9'],
-    ['<    2.0.0', '1.9999.9999'],
-    ['<\t2.0.0', '0.2.9'],
-    ['>=0.1.97', 'v0.1.97', true],
-    ['>=0.1.97', '0.1.97'],
-    ['0.1.20 || 1.2.4', '1.2.4'],
-    ['>=0.2.3 || <0.0.1', '0.0.0'],
-    ['>=0.2.3 || <0.0.1', '0.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.4'],
-    ['||', '1.3.4'],
-    ['2.x.x', '2.1.3'],
-    ['1.2.x', '1.2.3'],
-    ['1.2.x || 2.x', '2.1.3'],
-    ['1.2.x || 2.x', '1.2.3'],
-    ['x', '1.2.3'],
-    ['2.*.*', '2.1.3'],
-    ['1.2.*', '1.2.3'],
-    ['1.2.* || 2.*', '2.1.3'],
-    ['1.2.* || 2.*', '1.2.3'],
-    ['*', '1.2.3'],
-    ['2', '2.1.2'],
-    ['2.3', '2.3.1'],
-    ['~2.4', '2.4.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.4.5'],
-    ['~>3.2.1', '3.2.2'], // >=3.2.1 <3.3.0,
-    ['~1', '1.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '1.2.3'],
-    ['~> 1', '1.2.3'],
-    ['~1.0', '1.0.2'], // >=1.0.0 <1.1.0,
-    ['~ 1.0', '1.0.2'],
-    ['~ 1.0.3', '1.0.12'],
-    ['>=1', '1.0.0'],
-    ['>= 1', '1.0.0'],
-    ['<1.2', '1.1.1'],
-    ['< 1.2', '1.1.1'],
-    ['1', '1.0.0beta', true],
-    ['~v0.5.4-pre', '0.5.5'],
-    ['~v0.5.4-pre', '0.5.4'],
-    ['=0.7.x', '0.7.2'],
-    ['>=0.7.x', '0.7.2'],
-    ['=0.7.x', '0.7.0-asdf'],
-    ['>=0.7.x', '0.7.0-asdf'],
-    ['<=0.7.x', '0.6.2'],
-    ['~1.2.1 >=1.2.3', '1.2.3'],
-    ['~1.2.1 =1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3', '1.2.3'],
-    ['~1.2.1 >=1.2.3 1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3 >=1.2.3', '1.2.3'],
-    ['~1.2.1 1.2.3', '1.2.3'],
-    ['>=1.2.1 1.2.3', '1.2.3'],
-    ['1.2.3 >=1.2.1', '1.2.3'],
-    ['>=1.2.3 >=1.2.1', '1.2.3'],
-    ['>=1.2.1 >=1.2.3', '1.2.3'],
-    ['<=1.2.3', '1.2.3-beta'],
-    ['>1.2', '1.3.0-beta'],
-    ['>=1.2', '1.2.8'],
-    ['^1.2.3', '1.8.1'],
-    ['^1.2.3', '1.2.3-beta'],
-    ['^0.1.2', '0.1.2'],
-    ['^0.1', '0.1.2'],
-    ['^1.2', '1.4.2'],
-    ['^1.2 ^1', '1.4.2'],
-    ['^1.2', '1.2.0-pre'],
-    ['^1.2.3', '1.2.3-pre']
-  ].forEach(function(v) {
-    var range = v[0];
-    var ver = v[1];
-    var loose = v[2];
-    t.ok(satisfies(ver, range, loose), range + ' satisfied by ' + ver);
-  });
-  t.end();
-});
-
-test('\nnegative range tests', function(t) {
-  // [range, version]
-  // version should not be included by range
-  [['1.0.0 - 2.0.0', '2.2.3'],
-    ['1.0.0', '1.0.1'],
-    ['>=1.0.0', '0.0.0'],
-    ['>=1.0.0', '0.0.1'],
-    ['>=1.0.0', '0.1.0'],
-    ['>1.0.0', '0.0.1'],
-    ['>1.0.0', '0.1.0'],
-    ['<=2.0.0', '3.0.0'],
-    ['<=2.0.0', '2.9999.9999'],
-    ['<=2.0.0', '2.2.9'],
-    ['<2.0.0', '2.9999.9999'],
-    ['<2.0.0', '2.2.9'],
-    ['>=0.1.97', 'v0.1.93', true],
-    ['>=0.1.97', '0.1.93'],
-    ['0.1.20 || 1.2.4', '1.2.3'],
-    ['>=0.2.3 || <0.0.1', '0.0.3'],
-    ['>=0.2.3 || <0.0.1', '0.2.2'],
-    ['2.x.x', '1.1.3'],
-    ['2.x.x', '3.1.3'],
-    ['1.2.x', '1.3.3'],
-    ['1.2.x || 2.x', '3.1.3'],
-    ['1.2.x || 2.x', '1.1.3'],
-    ['2.*.*', '1.1.3'],
-    ['2.*.*', '3.1.3'],
-    ['1.2.*', '1.3.3'],
-    ['1.2.* || 2.*', '3.1.3'],
-    ['1.2.* || 2.*', '1.1.3'],
-    ['2', '1.1.2'],
-    ['2.3', '2.4.1'],
-    ['~2.4', '2.5.0'], // >=2.4.0 <2.5.0
-    ['~2.4', '2.3.9'],
-    ['~>3.2.1', '3.3.2'], // >=3.2.1 <3.3.0
-    ['~>3.2.1', '3.2.0'], // >=3.2.1 <3.3.0
-    ['~1', '0.2.3'], // >=1.0.0 <2.0.0
-    ['~>1', '2.2.3'],
-    ['~1.0', '1.1.0'], // >=1.0.0 <1.1.0
-    ['<1', '1.0.0'],
-    ['>=1.2', '1.1.1'],
-    ['1', '2.0.0beta', true],
-    ['~v0.5.4-beta', '0.5.4-alpha'],
-    ['<1', '1.0.0beta', true],
-    ['< 1', '1.0.0beta', true],
-    ['=0.7.x', '0.8.2'],
-    ['>=0.7.x', '0.6.2'],
-    ['<=0.7.x', '0.7.2'],
-    ['<1.2.3', '1.2.3-beta'],
-    ['=1.2.3', '1.2.3-beta'],
-    ['>1.2', '1.2.8'],
-    ['^1.2.3', '2.0.0-alpha'],
-    ['^1.2.3', '1.2.2'],
-    ['^1.2', '1.1.9'],
-    // invalid ranges never satisfied!
-    ['blerg', '1.2.3'],
-    ['git+https://user:password0123@github.com/foo', '123.0.0', true],
-    ['^1.2.3', '2.0.0-pre']
-  ].forEach(function(v) {
-    var range = v[0];
-    var ver = v[1];
-    var loose = v[2];
-    var found = satisfies(ver, range, loose);
-    t.ok(!found, ver + ' not satisfied by ' + range);
-  });
-  t.end();
-});
-
-test('\nincrement versions test', function(t) {
-  // [version, inc, result]
-  // inc(version, inc) -> result
-  [['1.2.3', 'major', '2.0.0'],
-    ['1.2.3', 'minor', '1.3.0'],
-    ['1.2.3', 'patch', '1.2.4'],
-    ['1.2.3tag', 'major', '2.0.0', true],
-    ['1.2.3-tag', 'major', '2.0.0'],
-    ['1.2.3', 'fake', null],
-    ['fake', 'major', null],
-    ['1.2.3', 'prerelease', '1.2.3-0'],
-    ['1.2.3-0', 'prerelease', '1.2.3-1'],
-    ['1.2.3-alpha.0', 'prerelease', '1.2.3-alpha.1'],
-    ['1.2.3-alpha.1', 'prerelease', '1.2.3-alpha.2'],
-    ['1.2.3-alpha.2', 'prerelease', '1.2.3-alpha.3'],
-    ['1.2.3-alpha.0.beta', 'prerelease', '1.2.3-alpha.1.beta'],
-    ['1.2.3-alpha.1.beta', 'prerelease', '1.2.3-alpha.2.beta'],
-    ['1.2.3-alpha.2.beta', 'prerelease', '1.2.3-alpha.3.beta'],
-    ['1.2.3-alpha.10.0.beta', 'prerelease', '1.2.3-alpha.10.1.beta'],
-    ['1.2.3-alpha.10.1.beta', 'prerelease', '1.2.3-alpha.10.2.beta'],
-    ['1.2.3-alpha.10.2.beta', 'prerelease', '1.2.3-alpha.10.3.beta'],
-    ['1.2.3-alpha.10.beta.0', 'prerelease', '1.2.3-alpha.10.beta.1'],
-    ['1.2.3-alpha.10.beta.1', 'prerelease', '1.2.3-alpha.10.beta.2'],
-    ['1.2.3-alpha.10.beta.2', 'prerelease', '1.2.3-alpha.10.beta.3'],
-    ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta'],
-    ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta'],
-    ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta']
-  ].forEach(function(v) {
-    var pre = v[0];
-    var what = v[1];
-    var wanted = v[2];
-    var loose = v[3];
-    var found = inc(pre, what, loose);
-    t.equal(found, wanted, 'inc(' + pre + ', ' + what + ') === ' + wanted);
-  });
-
-  t.end();
-});
-
-test('\nvalid range test', function(t) {
-  // [range, result]
-  // validRange(range) -> result
-  // translate ranges into their canonical form
-  [['1.0.0 - 2.0.0', '>=1.0.0 <=2.0.0'],
-    ['1.0.0', '1.0.0'],
-    ['>=*', '>=0.0.0-0'],
-    ['', '*'],
-    ['*', '*'],
-    ['*', '*'],
-    ['>=1.0.0', '>=1.0.0'],
-    ['>1.0.0', '>1.0.0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['1', '>=1.0.0-0 <2.0.0-0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['<=2.0.0', '<=2.0.0'],
-    ['<2.0.0', '<2.0.0-0'],
-    ['<2.0.0', '<2.0.0-0'],
-    ['>= 1.0.0', '>=1.0.0'],
-    ['>=  1.0.0', '>=1.0.0'],
-    ['>=   1.0.0', '>=1.0.0'],
-    ['> 1.0.0', '>1.0.0'],
-    ['>  1.0.0', '>1.0.0'],
-    ['<=   2.0.0', '<=2.0.0'],
-    ['<= 2.0.0', '<=2.0.0'],
-    ['<=  2.0.0', '<=2.0.0'],
-    ['<    2.0.0', '<2.0.0-0'],
-    ['<	2.0.0', '<2.0.0-0'],
-    ['>=0.1.97', '>=0.1.97'],
-    ['>=0.1.97', '>=0.1.97'],
-    ['0.1.20 || 1.2.4', '0.1.20||1.2.4'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1-0'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1-0'],
-    ['>=0.2.3 || <0.0.1', '>=0.2.3||<0.0.1-0'],
-    ['||', '||'],
-    ['2.x.x', '>=2.0.0-0 <3.0.0-0'],
-    ['1.2.x', '>=1.2.0-0 <1.3.0-0'],
-    ['1.2.x || 2.x', '>=1.2.0-0 <1.3.0-0||>=2.0.0-0 <3.0.0-0'],
-    ['1.2.x || 2.x', '>=1.2.0-0 <1.3.0-0||>=2.0.0-0 <3.0.0-0'],
-    ['x', '*'],
-    ['2.*.*', '>=2.0.0-0 <3.0.0-0'],
-    ['1.2.*', '>=1.2.0-0 <1.3.0-0'],
-    ['1.2.* || 2.*', '>=1.2.0-0 <1.3.0-0||>=2.0.0-0 <3.0.0-0'],
-    ['*', '*'],
-    ['2', '>=2.0.0-0 <3.0.0-0'],
-    ['2.3', '>=2.3.0-0 <2.4.0-0'],
-    ['~2.4', '>=2.4.0-0 <2.5.0-0'],
-    ['~2.4', '>=2.4.0-0 <2.5.0-0'],
-    ['~>3.2.1', '>=3.2.1-0 <3.3.0-0'],
-    ['~1', '>=1.0.0-0 <2.0.0-0'],
-    ['~>1', '>=1.0.0-0 <2.0.0-0'],
-    ['~> 1', '>=1.0.0-0 <2.0.0-0'],
-    ['~1.0', '>=1.0.0-0 <1.1.0-0'],
-    ['~ 1.0', '>=1.0.0-0 <1.1.0-0'],
-    ['^0', '>=0.0.0-0 <1.0.0-0'],
-    ['^ 1', '>=1.0.0-0 <2.0.0-0'],
-    ['^0.1', '>=0.1.0-0 <0.2.0-0'],
-    ['^1.0', '>=1.0.0-0 <2.0.0-0'],
-    ['^1.2', '>=1.2.0-0 <2.0.0-0'],
-    ['^0.0.1', '=0.0.1'],
-    ['^0.0.1-beta', '=0.0.1-beta'],
-    ['^0.1.2', '>=0.1.2-0 <0.2.0-0'],
-    ['^1.2.3', '>=1.2.3-0 <2.0.0-0'],
-    ['^1.2.3-beta.4', '>=1.2.3-beta.4 <2.0.0-0'],
-    ['<1', '<1.0.0-0'],
-    ['< 1', '<1.0.0-0'],
-    ['>=1', '>=1.0.0-0'],
-    ['>= 1', '>=1.0.0-0'],
-    ['<1.2', '<1.2.0-0'],
-    ['< 1.2', '<1.2.0-0'],
-    ['1', '>=1.0.0-0 <2.0.0-0'],
-    ['>01.02.03', '>1.2.3', true],
-    ['>01.02.03', null],
-    ['~1.2.3beta', '>=1.2.3-beta <1.3.0-0', true],
-    ['~1.2.3beta', null],
-    ['^ 1.2 ^ 1', '>=1.2.0-0 <2.0.0-0 >=1.0.0-0 <2.0.0-0']
-  ].forEach(function(v) {
-    var pre = v[0];
-    var wanted = v[1];
-    var loose = v[2];
-    var found = validRange(pre, loose);
-
-    t.equal(found, wanted, 'validRange(' + pre + ') === ' + wanted);
-  });
-
-  t.end();
-});
-
-test('\ncomparators test', function(t) {
-  // [range, comparators]
-  // turn range into a set of individual comparators
-  [['1.0.0 - 2.0.0', [['>=1.0.0', '<=2.0.0']]],
-    ['1.0.0', [['1.0.0']]],
-    ['>=*', [['>=0.0.0-0']]],
-    ['', [['']]],
-    ['*', [['']]],
-    ['*', [['']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>=1.0.0', [['>=1.0.0']]],
-    ['>1.0.0', [['>1.0.0']]],
-    ['>1.0.0', [['>1.0.0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['1', [['>=1.0.0-0', '<2.0.0-0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['<=2.0.0', [['<=2.0.0']]],
-    ['<2.0.0', [['<2.0.0-0']]],
-    ['<2.0.0', [['<2.0.0-0']]],
-    ['>= 1.0.0', [['>=1.0.0']]],
-    ['>=  1.0.0', [['>=1.0.0']]],
-    ['>=   1.0.0', [['>=1.0.0']]],
-    ['> 1.0.0', [['>1.0.0']]],
-    ['>  1.0.0', [['>1.0.0']]],
-    ['<=   2.0.0', [['<=2.0.0']]],
-    ['<= 2.0.0', [['<=2.0.0']]],
-    ['<=  2.0.0', [['<=2.0.0']]],
-    ['<    2.0.0', [['<2.0.0-0']]],
-    ['<\t2.0.0', [['<2.0.0-0']]],
-    ['>=0.1.97', [['>=0.1.97']]],
-    ['>=0.1.97', [['>=0.1.97']]],
-    ['0.1.20 || 1.2.4', [['0.1.20'], ['1.2.4']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1-0']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1-0']]],
-    ['>=0.2.3 || <0.0.1', [['>=0.2.3'], ['<0.0.1-0']]],
-    ['||', [[''], ['']]],
-    ['2.x.x', [['>=2.0.0-0', '<3.0.0-0']]],
-    ['1.2.x', [['>=1.2.0-0', '<1.3.0-0']]],
-    ['1.2.x || 2.x', [['>=1.2.0-0', '<1.3.0-0'], ['>=2.0.0-0', '<3.0.0-0']]],
-    ['1.2.x || 2.x', [['>=1.2.0-0', '<1.3.0-0'], ['>=2.0.0-0', '<3.0.0-0']]],
-    ['x', [['']]],
-    ['2.*.*', [['>=2.0.0-0', '<3.0.0-0']]],
-    ['1.2.*', [['>=1.2.0-0', '<1.3.0-0']]],
-    ['1.2.* || 2.*', [['>=1.2.0-0', '<1.3.0-0'], ['>=2.0.0-0', '<3.0.0-0']]],
-    ['1.2.* || 2.*', [['>=1.2.0-0', '<1.3.0-0'], ['>=2.0.0-0', '<3.0.0-0']]],
-    ['*', [['']]],
-    ['2', [['>=2.0.0-0', '<3.0.0-0']]],
-    ['2.3', [['>=2.3.0-0', '<2.4.0-0']]],
-    ['~2.4', [['>=2.4.0-0', '<2.5.0-0']]],
-    ['~2.4', [['>=2.4.0-0', '<2.5.0-0']]],
-    ['~>3.2.1', [['>=3.2.1-0', '<3.3.0-0']]],
-    ['~1', [['>=1.0.0-0', '<2.0.0-0']]],
-    ['~>1', [['>=1.0.0-0', '<2.0.0-0']]],
-    ['~> 1', [['>=1.0.0-0', '<2.0.0-0']]],
-    ['~1.0', [['>=1.0.0-0', '<1.1.0-0']]],
-    ['~ 1.0', [['>=1.0.0-0', '<1.1.0-0']]],
-    ['~ 1.0.3', [['>=1.0.3-0', '<1.1.0-0']]],
-    ['~> 1.0.3', [['>=1.0.3-0', '<1.1.0-0']]],
-    ['<1', [['<1.0.0-0']]],
-    ['< 1', [['<1.0.0-0']]],
-    ['>=1', [['>=1.0.0-0']]],
-    ['>= 1', [['>=1.0.0-0']]],
-    ['<1.2', [['<1.2.0-0']]],
-    ['< 1.2', [['<1.2.0-0']]],
-    ['1', [['>=1.0.0-0', '<2.0.0-0']]],
-    ['1 2', [['>=1.0.0-0', '<2.0.0-0', '>=2.0.0-0', '<3.0.0-0']]],
-    ['1.2 - 3.4.5', [['>=1.2.0-0', '<=3.4.5']]],
-    ['1.2.3 - 3.4', [['>=1.2.3', '<3.5.0-0']]]
-  ].forEach(function(v) {
-    var pre = v[0];
-    var wanted = v[1];
-    var found = toComparators(v[0]);
-    var jw = JSON.stringify(wanted);
-    t.equivalent(found, wanted, 'toComparators(' + pre + ') === ' + jw);
-  });
-
-  t.end();
-});
-
-test('\nstrict vs loose version numbers', function(t) {
-  [['=1.2.3', '1.2.3'],
-    ['01.02.03', '1.2.3'],
-    ['1.2.3-beta.01', '1.2.3-beta.1'],
-    ['   =1.2.3', '1.2.3'],
-    ['1.2.3foo', '1.2.3-foo']
-  ].forEach(function(v) {
-    var loose = v[0];
-    var strict = v[1];
-    t.throws(function() {
-      new SemVer(loose);
-    });
-    var lv = new SemVer(loose, true);
-    t.equal(lv.version, strict);
-    t.ok(eq(loose, strict, true));
-    t.throws(function() {
-      eq(loose, strict);
-    });
-    t.throws(function() {
-      new SemVer(strict).compare(loose);
-    });
-  });
-  t.end();
-});
-
-test('\nstrict vs loose ranges', function(t) {
-  [['>=01.02.03', '>=1.2.3'],
-    ['~1.02.03beta', '>=1.2.3-beta <1.3.0-0']
-  ].forEach(function(v) {
-    var loose = v[0];
-    var comps = v[1];
-    t.throws(function() {
-      new Range(loose);
-    });
-    t.equal(new Range(loose, true).range, comps);
-  });
-  t.end();
-});
-
-test('\nmax satisfying', function(t) {
-  [[['1.2.3', '1.2.4'], '1.2', '1.2.4'],
-    [['1.2.4', '1.2.3'], '1.2', '1.2.4'],
-    [['1.2.3','1.2.4','1.2.5','1.2.6'], '~1.2.3', '1.2.6'],
-    [['1.1.0', '1.2.0', '1.2.1', '1.3.0', '2.0.0b1', '2.0.0b2', '2.0.0b3', '2.0.0', '2.1.0'], '~2.0.0', '2.0.0', true]
-  ].forEach(function(v) {
-    var versions = v[0];
-    var range = v[1];
-    var expect = v[2];
-    var loose = v[3];
-    var actual = semver.maxSatisfying(versions, range, loose);
-    t.equal(actual, expect);
-  });
-  t.end();
-});
diff --git a/node_modules/semver/test/no-module.js b/node_modules/semver/test/no-module.js
deleted file mode 100644
index 96d1cd1fc5..0000000000
--- a/node_modules/semver/test/no-module.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var tap = require('tap');
-var test = tap.test;
-
-test('no module system', function(t) {
-  var fs = require('fs');
-  var vm = require('vm');
-  var head = fs.readFileSync(require.resolve('../head.js'), 'utf8');
-  var src = fs.readFileSync(require.resolve('../'), 'utf8');
-  var foot = fs.readFileSync(require.resolve('../foot.js'), 'utf8');
-  vm.runInThisContext(head + src + foot, 'semver.js');
-
-  // just some basic poking to see if it did some stuff
-  t.type(global.semver, 'object');
-  t.type(global.semver.SemVer, 'function');
-  t.type(global.semver.Range, 'function');
-  t.ok(global.semver.satisfies('1.2.3', '1.2'));
-  t.end();
-});
-
diff --git a/node_modules/tar/node_modules/block-stream/test/basic.js b/node_modules/tar/node_modules/block-stream/test/basic.js
deleted file mode 100644
index b4b930511e..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/basic.js
+++ /dev/null
@@ -1,27 +0,0 @@
-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/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js b/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
deleted file mode 100644
index 7a8de88b5b..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/nopad-thorough.js
+++ /dev/null
@@ -1,68 +0,0 @@
-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/node_modules/tar/node_modules/block-stream/test/nopad.js b/node_modules/tar/node_modules/block-stream/test/nopad.js
deleted file mode 100644
index 6d38429fbc..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/nopad.js
+++ /dev/null
@@ -1,57 +0,0 @@
-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/node_modules/tar/node_modules/block-stream/test/pause-resume.js b/node_modules/tar/node_modules/block-stream/test/pause-resume.js
deleted file mode 100644
index 64d0d091da..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/pause-resume.js
+++ /dev/null
@@ -1,73 +0,0 @@
-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/node_modules/tar/node_modules/block-stream/test/thorough.js b/node_modules/tar/node_modules/block-stream/test/thorough.js
deleted file mode 100644
index 1cc9ea08a3..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/thorough.js
+++ /dev/null
@@ -1,68 +0,0 @@
-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/node_modules/tar/node_modules/block-stream/test/two-stream.js b/node_modules/tar/node_modules/block-stream/test/two-stream.js
deleted file mode 100644
index c6db79a43d..0000000000
--- a/node_modules/tar/node_modules/block-stream/test/two-stream.js
+++ /dev/null
@@ -1,59 +0,0 @@
-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/node_modules/tar/test/00-setup-fixtures.js b/node_modules/tar/test/00-setup-fixtures.js
deleted file mode 100644
index 1524ff7af0..0000000000
--- a/node_modules/tar/test/00-setup-fixtures.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// the fixtures have some weird stuff that is painful
-// to include directly in the repo for various reasons.
-//
-// So, unpack the fixtures with the system tar first.
-//
-// This means, of course, that it'll only work if you
-// already have a tar implementation, and some of them
-// will not properly unpack the fixtures anyway.
-//
-// But, since usually those tests will fail on Windows
-// and other systems with less capable filesystems anyway,
-// at least this way we don't cause inconveniences by
-// merely cloning the repo or installing the package.
-
-var tap = require("tap")
-, child_process = require("child_process")
-, rimraf = require("rimraf")
-, test = tap.test
-, path = require("path")
-
-test("clean fixtures", function (t) {
-  rimraf(path.resolve(__dirname, "fixtures"), function (er) {
-    t.ifError(er, "rimraf ./fixtures/")
-    t.end()
-  })
-})
-
-test("clean tmp", function (t) {
-  rimraf(path.resolve(__dirname, "tmp"), function (er) {
-    t.ifError(er, "rimraf ./tmp/")
-    t.end()
-  })
-})
-
-test("extract fixtures", function (t) {
-  var c = child_process.spawn("tar"
-                             ,["xzvf", "fixtures.tgz"]
-                             ,{ cwd: __dirname })
-
-  c.stdout.on("data", errwrite)
-  c.stderr.on("data", errwrite)
-  function errwrite (chunk) {
-    process.stderr.write(chunk)
-  }
-
-  c.on("exit", function (code) {
-    t.equal(code, 0, "extract fixtures should exit with 0")
-    if (code) {
-      t.comment("Note, all tests from here on out will fail because of this.")
-    }
-    t.end()
-  })
-})
diff --git a/node_modules/tar/test/extract.js b/node_modules/tar/test/extract.js
deleted file mode 100644
index fff481816f..0000000000
--- a/node_modules/tar/test/extract.js
+++ /dev/null
@@ -1,358 +0,0 @@
-var tap = require("tap")
-  , tar = require("../tar.js")
-  , fs = require("fs")
-  , path = require("path")
-  , file = path.resolve(__dirname, "fixtures/c.tar")
-  , target = path.resolve(__dirname, "tmp/extract-test")
-  , index = 0
-  , fstream = require("fstream")
-
-  , ee = 0
-  , expectEntries =
-[ { path: 'c.txt',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 513,
-    linkpath: '',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: 'cc.txt',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 513,
-    linkpath: '',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: 'r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 100,
-    linkpath: '',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: 'Ω.txt',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 2,
-    linkpath: '',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: 'Ω.txt',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 2,
-    linkpath: '',
-    nlink: 1,
-    dev: 234881026,
-    ino: 51693379 },
-  { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 200,
-    linkpath: '',
-    nlink: 1,
-    dev: 234881026,
-    ino: 51681874 },
-  { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 201,
-    linkpath: '',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: '200LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL',
-    mode: '777',
-    type: '2',
-    depth: undefined,
-    size: 0,
-    linkpath: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    nlink: undefined,
-    dev: undefined,
-    ino: undefined },
-  { path: '200-hard',
-    mode: '644',
-    type: '0',
-    depth: undefined,
-    size: 200,
-    linkpath: '',
-    nlink: 2,
-    dev: 234881026,
-    ino: 51681874 },
-  { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '644',
-    type: '1',
-    depth: undefined,
-    size: 0,
-    linkpath: path.resolve(target, '200-hard'),
-    nlink: 2,
-    dev: 234881026,
-    ino: 51681874 } ]
-
-  , ef = 0
-  , expectFiles =
-[ { path: '',
-    mode: '40755',
-    type: 'Directory',
-    depth: 0,
-    linkpath: undefined },
-  { path: '/200-hard',
-    mode: '100644',
-    type: 'File',
-    depth: 1,
-    size: 200,
-    linkpath: undefined,
-    nlink: 2 },
-  { path: '/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '100644',
-    type: 'Link',
-    depth: 1,
-    size: 200,
-    linkpath: path.join(target, '200-hard'),
-    nlink: 2 },
-  { path: '/200LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL',
-    mode: '120777',
-    type: 'SymbolicLink',
-    depth: 1,
-    size: 200,
-    linkpath: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    nlink: 1 },
-  { path: '/c.txt',
-    mode: '100644',
-    type: 'File',
-    depth: 1,
-    size: 513,
-    linkpath: undefined,
-    nlink: 1 },
-  { path: '/cc.txt',
-    mode: '100644',
-    type: 'File',
-    depth: 1,
-    size: 513,
-    linkpath: undefined,
-    nlink: 1 },
-  { path: '/r',
-    mode: '40755',
-    type: 'Directory',
-    depth: 1,
-    linkpath: undefined },
-  { path: '/r/e',
-    mode: '40755',
-    type: 'Directory',
-    depth: 2,
-    linkpath: undefined },
-  { path: '/r/e/a',
-    mode: '40755',
-    type: 'Directory',
-    depth: 3,
-    linkpath: undefined },
-  { path: '/r/e/a/l',
-    mode: '40755',
-    type: 'Directory',
-    depth: 4,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l',
-    mode: '40755',
-    type: 'Directory',
-    depth: 5,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y',
-    mode: '40755',
-    type: 'Directory',
-    depth: 6,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-',
-    mode: '40755',
-    type: 'Directory',
-    depth: 7,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d',
-    mode: '40755',
-    type: 'Directory',
-    depth: 8,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e',
-    mode: '40755',
-    type: 'Directory',
-    depth: 9,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e',
-    mode: '40755',
-    type: 'Directory',
-    depth: 10,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p',
-    mode: '40755',
-    type: 'Directory',
-    depth: 11,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-',
-    mode: '40755',
-    type: 'Directory',
-    depth: 12,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f',
-    mode: '40755',
-    type: 'Directory',
-    depth: 13,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o',
-    mode: '40755',
-    type: 'Directory',
-    depth: 14,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l',
-    mode: '40755',
-    type: 'Directory',
-    depth: 15,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d',
-    mode: '40755',
-    type: 'Directory',
-    depth: 16,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e',
-    mode: '40755',
-    type: 'Directory',
-    depth: 17,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r',
-    mode: '40755',
-    type: 'Directory',
-    depth: 18,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-',
-    mode: '40755',
-    type: 'Directory',
-    depth: 19,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p',
-    mode: '40755',
-    type: 'Directory',
-    depth: 20,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a',
-    mode: '40755',
-    type: 'Directory',
-    depth: 21,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t',
-    mode: '40755',
-    type: 'Directory',
-    depth: 22,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h',
-    mode: '40755',
-    type: 'Directory',
-    depth: 23,
-    linkpath: undefined },
-  { path: '/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-    mode: '100644',
-    type: 'File',
-    depth: 24,
-    size: 100,
-    linkpath: undefined,
-    nlink: 1 },
-  { path: '/Ω.txt',
-    mode: '100644',
-    type: 'File',
-    depth: 1,
-    size: 2,
-    linkpath: undefined,
-    nlink: 1 } ]
-
-
-
-// The extract class basically just pipes the input
-// to a Reader, and then to a fstream.DirWriter
-
-// So, this is as much a test of fstream.Reader and fstream.Writer
-// as it is of tar.Extract, but it sort of makes sense.
-
-tap.test("extract test", function (t) {
-  var extract = tar.Extract(target)
-  var inp = fs.createReadStream(file)
-
-  // give it a weird buffer size to try to break in odd places
-  inp.bufferSize = 1234
-
-  inp.pipe(extract)
-
-  extract.on("end", function () {
-    t.equal(ee, expectEntries.length, "should see "+ee+" entries")
-
-    // should get no more entries after end
-    extract.removeAllListeners("entry")
-    extract.on("entry", function (e) {
-      t.fail("Should not get entries after end!")
-    })
-
-    next()
-  })
-
-  extract.on("entry", function (entry) {
-    var found =
-      { path: entry.path
-      , mode: entry.props.mode.toString(8)
-      , type: entry.props.type
-      , depth: entry.props.depth
-      , size: entry.props.size
-      , linkpath: entry.props.linkpath
-      , nlink: entry.props.nlink
-      , dev: entry.props.dev
-      , ino: entry.props.ino
-      }
-
-    var wanted = expectEntries[ee ++]
-
-    t.equivalent(found, wanted, "tar entry " + ee + " " + wanted.path)
-  })
-
-  function next () {
-    var r = fstream.Reader({ path: target
-                           , type: "Directory"
-                           // this is just to encourage consistency
-                           , sort: "alpha" })
-
-    r.on("ready", function () {
-      foundEntry(r)
-    })
-
-    r.on("end", finish)
-
-    function foundEntry (entry) {
-      var p = entry.path.substr(target.length)
-      var found =
-        { path: p
-        , mode: entry.props.mode.toString(8)
-        , type: entry.props.type
-        , depth: entry.props.depth
-        , size: entry.props.size
-        , linkpath: entry.props.linkpath
-        , nlink: entry.props.nlink
-        }
-
-      var wanted = expectFiles[ef ++]
-
-      t.has(found, wanted, "unpacked file " + ef + " " + wanted.path)
-
-      entry.on("entry", foundEntry)
-    }
-
-    function finish () {
-      t.equal(ef, expectFiles.length, "should have "+ef+" items")
-      t.end()
-    }
-  }
-})
diff --git a/node_modules/tar/test/fixtures.tgz b/node_modules/tar/test/fixtures.tgz
deleted file mode 100644
index 4501bcf226..0000000000
Binary files a/node_modules/tar/test/fixtures.tgz and /dev/null differ
diff --git a/node_modules/tar/test/header.js b/node_modules/tar/test/header.js
deleted file mode 100644
index 8ea6f79500..0000000000
--- a/node_modules/tar/test/header.js
+++ /dev/null
@@ -1,183 +0,0 @@
-var tap = require("tap")
-var TarHeader = require("../lib/header.js")
-var tar = require("../tar.js")
-var fs = require("fs")
-
-
-var headers =
-  { "a.txt file header":
-    [ "612e747874000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030303036343420003035373736312000303030303234200030303030303030303430312031313635313336303333332030313234353100203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000757374617200303069736161637300000000000000000000000000000000000000000000000000007374616666000000000000000000000000000000000000000000000000000000303030303030200030303030303020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true
-      , path: 'a.txt'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 257
-      , mtime: 1319493851
-      , cksum: 5417
-      , type: '0'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' }
-    ]
-
-  , "omega pax": // the extended header from omega tar.
-    [ "5061784865616465722fcea92e74787400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030303036343420003035373736312000303030303234200030303030303030303137302031313534333731303631312030313530353100207800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000757374617200303069736161637300000000000000000000000000000000000000000000000000007374616666000000000000000000000000000000000000000000000000000000303030303030200030303030303020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true
-      , path: 'PaxHeader/Ω.txt'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 120
-      , mtime: 1301254537
-      , cksum: 6697
-      , type: 'x'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' } ]
-
-  , "omega file header":
-    [ "cea92e7478740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030303036343420003035373736312000303030303234200030303030303030303030322031313534333731303631312030313330373200203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000757374617200303069736161637300000000000000000000000000000000000000000000000000007374616666000000000000000000000000000000000000000000000000000000303030303030200030303030303020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true
-      , path: 'Ω.txt'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 2
-      , mtime: 1301254537
-      , cksum: 5690
-      , type: '0'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' } ]
-
-  , "foo.js file header":
-    [ "666f6f2e6a730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030303036343420003035373736312000303030303234200030303030303030303030342031313534333637303734312030313236313700203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000757374617200303069736161637300000000000000000000000000000000000000000000000000007374616666000000000000000000000000000000000000000000000000000000303030303030200030303030303020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true
-      , path: 'foo.js'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 4
-      , mtime: 1301246433
-      , cksum: 5519
-      , type: '0'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' }
-    ]
-
-  , "b.txt file header":
-    [ "622e747874000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030303036343420003035373736312000303030303234200030303030303030313030302031313635313336303637372030313234363100203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000757374617200303069736161637300000000000000000000000000000000000000000000000000007374616666000000000000000000000000000000000000000000000000000000303030303030200030303030303020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true
-      , path: 'b.txt'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 512
-      , mtime: 1319494079
-      , cksum: 5425
-      , type: '0'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' }
-    ]
-
-  , "deep nested file":
-    [ "636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363633030303634342000303537373631200030303030323420003030303030303030313434203131363532313531353333203034333331340020300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000075737461720030306973616163730000000000000000000000000000000000000000000000000000737461666600000000000000000000000000000000000000000000000000000030303030303020003030303030302000722f652f612f6c2f6c2f792f2d2f642f652f652f702f2d2f662f6f2f6c2f642f652f722f2d2f702f612f742f680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-    , { cksumValid: true,
-        path: 'r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
-      , mode: 420
-      , uid: 24561
-      , gid: 20
-      , size: 100
-      , mtime: 1319687003
-      , cksum: 18124
-      , type: '0'
-      , linkpath: ''
-      , ustar: 'ustar\0'
-      , ustarver: '00'
-      , uname: 'isaacs'
-      , gname: 'staff'
-      , devmaj: 0
-      , devmin: 0
-      , fill: '' }
-    ]
-  }
-
-tap.test("parsing", function (t) {
-  Object.keys(headers).forEach(function (name) {
-    var h = headers[name]
-      , header = new Buffer(h[0], "hex")
-      , expect = h[1]
-      , parsed = new TarHeader(header)
-
-    // console.error(parsed)
-    t.has(parsed, expect, "parse " + name)
-  })
-  t.end()
-})
-
-tap.test("encoding", function (t) {
-  Object.keys(headers).forEach(function (name) {
-    var h = headers[name]
-      , expect = new Buffer(h[0], "hex")
-      , encoded = TarHeader.encode(h[1])
-
-    // might have slightly different bytes, since the standard
-    // isn't very strict, but should have the same semantics
-    // checkSum will be different, but cksumValid will be true
-
-    var th = new TarHeader(encoded)
-    delete h[1].block
-    delete h[1].needExtended
-    delete h[1].cksum
-    t.has(th, h[1], "fields "+name)
-  })
-  t.end()
-})
-
-// test these manually.  they're a bit rare to find in the wild
-tap.test("parseNumeric tests", function (t) {
-  var parseNumeric = TarHeader.parseNumeric
-    , numbers =
-      { "303737373737373700": 2097151
-      , "30373737373737373737373700": 8589934591
-      , "303030303036343400": 420
-      , "800000ffffffffffff": 281474976710655
-      , "ffffff000000000001": -281474976710654
-      , "ffffff000000000000": -281474976710655
-      , "800000000000200000": 2097152
-      , "8000000000001544c5": 1393861
-      , "ffffffffffff1544c5": -15383354 }
-  Object.keys(numbers).forEach(function (n) {
-    var b = new Buffer(n, "hex")
-    t.equal(parseNumeric(b), numbers[n], n + " === " + numbers[n])
-  })
-  t.end()
-})
diff --git a/node_modules/tar/test/pack-no-proprietary.js b/node_modules/tar/test/pack-no-proprietary.js
deleted file mode 100644
index 5bf0e540f8..0000000000
--- a/node_modules/tar/test/pack-no-proprietary.js
+++ /dev/null
@@ -1,854 +0,0 @@
-// This is exactly like test/pack.js, except that it's excluding
-// any proprietary headers.
-//
-// This loses some information about the filesystem, but creates
-// tarballs that are supported by more versions of tar, especially
-// old non-spec-compliant copies of gnutar.
-
-// the symlink file is excluded from git, because it makes
-// windows freak the hell out.
-var fs = require("fs")
-  , path = require("path")
-  , symlink = path.resolve(__dirname, "fixtures/symlink")
-try { fs.unlinkSync(symlink) } catch (e) {}
-fs.symlinkSync("./hardlink-1", symlink)
-process.on("exit", function () {
-  fs.unlinkSync(symlink)
-})
-
-var tap = require("tap")
-  , tar = require("../tar.js")
-  , pkg = require("../package.json")
-  , Pack = tar.Pack
-  , fstream = require("fstream")
-  , Reader = fstream.Reader
-  , Writer = fstream.Writer
-  , input = path.resolve(__dirname, "fixtures/")
-  , target = path.resolve(__dirname, "tmp/pack.tar")
-  , uid = process.getuid ? process.getuid() : 0
-  , gid = process.getgid ? process.getgid() : 0
-
-  , entries =
-
-    // the global header and root fixtures/ dir are going to get
-    // a different date each time, so omit that bit.
-    // Also, dev/ino values differ across machines, so that's not
-    // included.
-    [ [ 'entry',
-      { path: 'fixtures/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/200cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: 'fixtures/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        uid: uid,
-        gid: gid,
-        size: 200 } ]
-
-    , [ 'entry',
-      { path: 'fixtures/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 200,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/a.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 257,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/b.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 512,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/c.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 513,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/cc.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 513,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/foo.js',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 4,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/hardlink-1',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 200,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/hardlink-2',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '1',
-        linkpath: 'fixtures/hardlink-1',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/omega.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/omega.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/star.4.html',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 54081,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/packtest/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: 'fixtures/packtest/Ω.txt',
-        uid: uid,
-        gid: gid,
-        size: 2 } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 100,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/symlink',
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '2',
-        linkpath: 'hardlink-1',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: "fixtures/Ω.txt"
-      , uid: uid
-      , gid: gid
-      , size: 2 } ]
-
-    , [ 'entry',
-      { path: 'fixtures/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-    ]
-
-
-// first, make sure that the hardlinks are actually hardlinks, or this
-// won't work.  Git has a way of replacing them with a copy.
-var hard1 = path.resolve(__dirname, "fixtures/hardlink-1")
-  , hard2 = path.resolve(__dirname, "fixtures/hardlink-2")
-  , fs = require("fs")
-
-try { fs.unlinkSync(hard2) } catch (e) {}
-fs.linkSync(hard1, hard2)
-
-tap.test("with global header", { timeout: 10000 }, function (t) {
-  runTest(t, true)
-})
-
-tap.test("without global header", { timeout: 10000 }, function (t) {
-  runTest(t, false)
-})
-
-function alphasort (a, b) {
-  return a === b ? 0
-       : a.toLowerCase() > b.toLowerCase() ? 1
-       : a.toLowerCase() < b.toLowerCase() ? -1
-       : a > b ? 1
-       : -1
-}
-
-
-function runTest (t, doGH) {
-  var reader = Reader({ path: input
-                      , filter: function () {
-                          return !this.path.match(/\.(tar|hex)$/)
-                        }
-                      , sort: alphasort
-                      })
-
-  var props = doGH ? pkg : {}
-  props.noProprietary = true
-  var pack = Pack(props)
-  var writer = Writer(target)
-
-  // global header should be skipped regardless, since it has no content.
-  var entry = 0
-
-  t.ok(reader, "reader ok")
-  t.ok(pack, "pack ok")
-  t.ok(writer, "writer ok")
-
-  pack.pipe(writer)
-
-  var parse = tar.Parse()
-  t.ok(parse, "parser should be ok")
-
-  pack.on("data", function (c) {
-    // console.error("PACK DATA")
-    if (c.length !== 512) {
-      // this one is too noisy, only assert if it'll be relevant
-      t.equal(c.length, 512, "parser should emit data in 512byte blocks")
-    }
-    parse.write(c)
-  })
-
-  pack.on("end", function () {
-    // console.error("PACK END")
-    t.pass("parser ends")
-    parse.end()
-  })
-
-  pack.on("error", function (er) {
-    t.fail("pack error", er)
-  })
-
-  parse.on("error", function (er) {
-    t.fail("parse error", er)
-  })
-
-  writer.on("error", function (er) {
-    t.fail("writer error", er)
-  })
-
-  reader.on("error", function (er) {
-    t.fail("reader error", er)
-  })
-
-  parse.on("*", function (ev, e) {
-    var wanted = entries[entry++]
-    if (!wanted) {
-      t.fail("unexpected event: "+ev)
-      return
-    }
-    t.equal(ev, wanted[0], "event type should be "+wanted[0])
-
-    if (ev !== wanted[0] || e.path !== wanted[1].path) {
-      console.error(wanted)
-      console.error([ev, e.props])
-      e.on("end", function () {
-        console.error(e.fields)
-        throw "break"
-      })
-    }
-
-    t.has(e.props, wanted[1], "properties "+wanted[1].path)
-    if (wanted[2]) {
-      e.on("end", function () {
-        if (!e.fields) {
-          t.ok(e.fields, "should get fields")
-        } else {
-          t.has(e.fields, wanted[2], "should get expected fields")
-        }
-      })
-    }
-  })
-
-  reader.pipe(pack)
-
-  writer.on("close", function () {
-    t.equal(entry, entries.length, "should get all expected entries")
-    t.pass("it finished")
-    t.end()
-  })
-
-}
diff --git a/node_modules/tar/test/pack.js b/node_modules/tar/test/pack.js
deleted file mode 100644
index 0f50994587..0000000000
--- a/node_modules/tar/test/pack.js
+++ /dev/null
@@ -1,897 +0,0 @@
-
-// the symlink file is excluded from git, because it makes
-// windows freak the hell out.
-var fs = require("fs")
-  , path = require("path")
-  , symlink = path.resolve(__dirname, "fixtures/symlink")
-try { fs.unlinkSync(symlink) } catch (e) {}
-fs.symlinkSync("./hardlink-1", symlink)
-process.on("exit", function () {
-  fs.unlinkSync(symlink)
-})
-
-
-var tap = require("tap")
-  , tar = require("../tar.js")
-  , pkg = require("../package.json")
-  , Pack = tar.Pack
-  , fstream = require("fstream")
-  , Reader = fstream.Reader
-  , Writer = fstream.Writer
-  , input = path.resolve(__dirname, "fixtures/")
-  , target = path.resolve(__dirname, "tmp/pack.tar")
-  , uid = process.getuid ? process.getuid() : 0
-  , gid = process.getgid ? process.getgid() : 0
-
-  , entries =
-
-    // the global header and root fixtures/ dir are going to get
-    // a different date each time, so omit that bit.
-    // Also, dev/ino values differ across machines, so that's not
-    // included.
-    [ [ 'globalExtendedHeader',
-      { path: 'PaxHeader/',
-        mode: 438,
-        uid: 0,
-        gid: 0,
-        type: 'g',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { "NODETAR.author": pkg.author,
-        "NODETAR.name": pkg.name,
-        "NODETAR.description": pkg.description,
-        "NODETAR.version": pkg.version,
-        "NODETAR.repository.type": pkg.repository.type,
-        "NODETAR.repository.url": pkg.repository.url,
-        "NODETAR.main": pkg.main,
-        "NODETAR.scripts.test": pkg.scripts.test } ]
-
-    , [ 'entry',
-      { path: 'fixtures/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/200cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: 'fixtures/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        'NODETAR.depth': '1',
-        'NODETAR.type': 'File',
-        nlink: 1,
-        uid: uid,
-        gid: gid,
-        size: 200,
-        'NODETAR.blksize': '4096',
-        'NODETAR.blocks': '8' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 200,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '',
-        'NODETAR.depth': '1',
-        'NODETAR.type': 'File',
-        nlink: 1,
-        'NODETAR.blksize': '4096',
-        'NODETAR.blocks': '8' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/a.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 257,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/b.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 512,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/c.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 513,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/cc.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 513,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/foo.js',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 4,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/hardlink-1',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 200,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/hardlink-2',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '1',
-        linkpath: 'fixtures/hardlink-1',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/omega.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/omega.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/star.4.html',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 54081,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/packtest/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: 'fixtures/packtest/Ω.txt',
-        'NODETAR.depth': '2',
-        'NODETAR.type': 'File',
-        nlink: 1,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        'NODETAR.blksize': '4096',
-        'NODETAR.blocks': '8' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/packtest/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '',
-        'NODETAR.depth': '2',
-        'NODETAR.type': 'File',
-        nlink: 1,
-        'NODETAR.blksize': '4096',
-        'NODETAR.blocks': '8' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/',
-        mode: 493,
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '5',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 100,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'entry',
-      { path: 'fixtures/symlink',
-        uid: uid,
-        gid: gid,
-        size: 0,
-        type: '2',
-        linkpath: 'hardlink-1',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' } ]
-
-    , [ 'extendedHeader',
-      { path: 'PaxHeader/fixtures/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        type: 'x',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '' },
-      { path: "fixtures/Ω.txt"
-      , "NODETAR.depth": "1"
-      , "NODETAR.type": "File"
-      , nlink: 1
-      , uid: uid
-      , gid: gid
-      , size: 2
-      , "NODETAR.blksize": "4096"
-      , "NODETAR.blocks": "8" } ]
-
-    , [ 'entry',
-      { path: 'fixtures/Ω.txt',
-        mode: 420,
-        uid: uid,
-        gid: gid,
-        size: 2,
-        type: '0',
-        linkpath: '',
-        ustar: 'ustar\u0000',
-        ustarver: '00',
-        uname: '',
-        gname: '',
-        devmaj: 0,
-        devmin: 0,
-        fill: '',
-        'NODETAR.depth': '1',
-        'NODETAR.type': 'File',
-        nlink: 1,
-        'NODETAR.blksize': '4096',
-        'NODETAR.blocks': '8' } ]
-    ]
-
-
-// first, make sure that the hardlinks are actually hardlinks, or this
-// won't work.  Git has a way of replacing them with a copy.
-var hard1 = path.resolve(__dirname, "fixtures/hardlink-1")
-  , hard2 = path.resolve(__dirname, "fixtures/hardlink-2")
-  , fs = require("fs")
-
-try { fs.unlinkSync(hard2) } catch (e) {}
-fs.linkSync(hard1, hard2)
-
-tap.test("with global header", { timeout: 10000 }, function (t) {
-  runTest(t, true)
-})
-
-tap.test("without global header", { timeout: 10000 }, function (t) {
-  runTest(t, false)
-})
-
-function alphasort (a, b) {
-  return a === b ? 0
-       : a.toLowerCase() > b.toLowerCase() ? 1
-       : a.toLowerCase() < b.toLowerCase() ? -1
-       : a > b ? 1
-       : -1
-}
-
-
-function runTest (t, doGH) {
-  var reader = Reader({ path: input
-                      , filter: function () {
-                          return !this.path.match(/\.(tar|hex)$/)
-                        }
-                      , sort: alphasort
-                      })
-
-  var pack = Pack(doGH ? pkg : null)
-  var writer = Writer(target)
-
-  // skip the global header if we're not doing that.
-  var entry = doGH ? 0 : 1
-
-  t.ok(reader, "reader ok")
-  t.ok(pack, "pack ok")
-  t.ok(writer, "writer ok")
-
-  pack.pipe(writer)
-
-  var parse = tar.Parse()
-  t.ok(parse, "parser should be ok")
-
-  pack.on("data", function (c) {
-    // console.error("PACK DATA")
-    if (c.length !== 512) {
-      // this one is too noisy, only assert if it'll be relevant
-      t.equal(c.length, 512, "parser should emit data in 512byte blocks")
-    }
-    parse.write(c)
-  })
-
-  pack.on("end", function () {
-    // console.error("PACK END")
-    t.pass("parser ends")
-    parse.end()
-  })
-
-  pack.on("error", function (er) {
-    t.fail("pack error", er)
-  })
-
-  parse.on("error", function (er) {
-    t.fail("parse error", er)
-  })
-
-  writer.on("error", function (er) {
-    t.fail("writer error", er)
-  })
-
-  reader.on("error", function (er) {
-    t.fail("reader error", er)
-  })
-
-  parse.on("*", function (ev, e) {
-    var wanted = entries[entry++]
-    if (!wanted) {
-      t.fail("unexpected event: "+ev)
-      return
-    }
-    t.equal(ev, wanted[0], "event type should be "+wanted[0])
-
-    // if (ev !== wanted[0] || e.path !== wanted[1].path) {
-    //   console.error(wanted)
-    //   console.error([ev, e.props])
-    //   throw "break"
-    // }
-
-    t.has(e.props, wanted[1], "properties "+wanted[1].path)
-    if (wanted[2]) {
-      e.on("end", function () {
-        if (!e.fields) {
-          t.ok(e.fields, "should get fields")
-        } else {
-          t.has(e.fields, wanted[2], "should get expected fields")
-        }
-      })
-    }
-  })
-
-  reader.pipe(pack)
-
-  writer.on("close", function () {
-    t.equal(entry, entries.length, "should get all expected entries")
-    t.pass("it finished")
-    t.end()
-  })
-
-}
diff --git a/node_modules/tar/test/parse.js b/node_modules/tar/test/parse.js
deleted file mode 100644
index f765a50129..0000000000
--- a/node_modules/tar/test/parse.js
+++ /dev/null
@@ -1,359 +0,0 @@
-var tap = require("tap")
-  , tar = require("../tar.js")
-  , fs = require("fs")
-  , path = require("path")
-  , file = path.resolve(__dirname, "fixtures/c.tar")
-  , index = 0
-
-  , expect =
-[ [ 'entry',
-    { path: 'c.txt',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 513,
-      mtime: new Date('Wed, 26 Oct 2011 01:10:58 GMT'),
-      cksum: 5422,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    undefined ],
-  [ 'entry',
-    { path: 'cc.txt',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 513,
-      mtime: new Date('Wed, 26 Oct 2011 01:11:02 GMT'),
-      cksum: 5525,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    undefined ],
-  [ 'entry',
-    { path: 'r/e/a/l/l/y/-/d/e/e/p/-/f/o/l/d/e/r/-/p/a/t/h/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 100,
-      mtime: new Date('Thu, 27 Oct 2011 03:43:23 GMT'),
-      cksum: 18124,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    undefined ],
-  [ 'entry',
-    { path: 'Ω.txt',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 2,
-      mtime: new Date('Thu, 27 Oct 2011 17:51:49 GMT'),
-      cksum: 5695,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    undefined ],
-  [ 'extendedHeader',
-    { path: 'PaxHeader/Ω.txt',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 120,
-      mtime: new Date('Thu, 27 Oct 2011 17:51:49 GMT'),
-      cksum: 6702,
-      type: 'x',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    { path: 'Ω.txt',
-      ctime: 1319737909,
-      atime: 1319739061,
-      dev: 234881026,
-      ino: 51693379,
-      nlink: 1 } ],
-  [ 'entry',
-    { path: 'Ω.txt',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 2,
-      mtime: new Date('Thu, 27 Oct 2011 17:51:49 GMT'),
-      cksum: 5695,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '',
-      ctime: new Date('Thu, 27 Oct 2011 17:51:49 GMT'),
-      atime: new Date('Thu, 27 Oct 2011 18:11:01 GMT'),
-      dev: 234881026,
-      ino: 51693379,
-      nlink: 1 },
-    undefined ],
-  [ 'extendedHeader',
-    { path: 'PaxHeader/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 353,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 14488,
-      type: 'x',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      ctime: 1319686868,
-      atime: 1319741254,
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 1 } ],
-  [ 'entry',
-    { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 200,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 14570,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '',
-      ctime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      atime: new Date('Thu, 27 Oct 2011 18:47:34 GMT'),
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 1 },
-    undefined ],
-  [ 'longPath',
-    { path: '././@LongLink',
-      mode: 0,
-      uid: 0,
-      gid: 0,
-      size: 201,
-      mtime: new Date('Thu, 01 Jan 1970 00:00:00 GMT'),
-      cksum: 4976,
-      type: 'L',
-      linkpath: '',
-      ustar: false },
-    '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ],
-  [ 'entry',
-    { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 1000,
-      gid: 1000,
-      size: 201,
-      mtime: new Date('Thu, 27 Oct 2011 22:21:50 GMT'),
-      cksum: 14086,
-      type: '0',
-      linkpath: '',
-      ustar: false },
-    undefined ],
-  [ 'longLinkpath',
-    { path: '././@LongLink',
-      mode: 0,
-      uid: 0,
-      gid: 0,
-      size: 201,
-      mtime: new Date('Thu, 01 Jan 1970 00:00:00 GMT'),
-      cksum: 4975,
-      type: 'K',
-      linkpath: '',
-      ustar: false },
-    '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' ],
-  [ 'longPath',
-    { path: '././@LongLink',
-      mode: 0,
-      uid: 0,
-      gid: 0,
-      size: 201,
-      mtime: new Date('Thu, 01 Jan 1970 00:00:00 GMT'),
-      cksum: 4976,
-      type: 'L',
-      linkpath: '',
-      ustar: false },
-    '200LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL' ],
-  [ 'entry',
-    { path: '200LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL',
-      mode: 511,
-      uid: 1000,
-      gid: 1000,
-      size: 0,
-      mtime: new Date('Fri, 28 Oct 2011 23:05:17 GMT'),
-      cksum: 21603,
-      type: '2',
-      linkpath: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      ustar: false },
-    undefined ],
-  [ 'extendedHeader',
-    { path: 'PaxHeader/200-hard',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 143,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 6533,
-      type: 'x',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    { ctime: 1320617144,
-      atime: 1320617232,
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 2 } ],
-  [ 'entry',
-    { path: '200-hard',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 200,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 5526,
-      type: '0',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '',
-      ctime: new Date('Sun, 06 Nov 2011 22:05:44 GMT'),
-      atime: new Date('Sun, 06 Nov 2011 22:07:12 GMT'),
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 2 },
-    undefined ],
-  [ 'extendedHeader',
-    { path: 'PaxHeader/200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 353,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 14488,
-      type: 'x',
-      linkpath: '',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '' },
-    { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      ctime: 1320617144,
-      atime: 1320617406,
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 2 } ],
-  [ 'entry',
-    { path: '200ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc',
-      mode: 420,
-      uid: 24561,
-      gid: 20,
-      size: 0,
-      mtime: new Date('Thu, 27 Oct 2011 03:41:08 GMT'),
-      cksum: 15173,
-      type: '1',
-      linkpath: '200-hard',
-      ustar: 'ustar\0',
-      ustarver: '00',
-      uname: 'isaacs',
-      gname: 'staff',
-      devmaj: 0,
-      devmin: 0,
-      fill: '',
-      ctime: new Date('Sun, 06 Nov 2011 22:05:44 GMT'),
-      atime: new Date('Sun, 06 Nov 2011 22:10:06 GMT'),
-      'LIBARCHIVE.creationtime': '1319686852',
-      dev: 234881026,
-      ino: 51681874,
-      nlink: 2 },
-    undefined ] ]
-
-
-tap.test("parser test", function (t) {
-  var parser = tar.Parse()
-
-  parser.on("end", function () {
-    t.equal(index, expect.length, "saw all expected events")
-    t.end()
-  })
-
-  fs.createReadStream(file)
-    .pipe(parser)
-    .on("*", function (ev, entry) {
-      var wanted = expect[index]
-      if (!wanted) {
-        return t.fail("Unexpected event: " + ev)
-      }
-      var result = [ev, entry.props]
-      entry.on("end", function () {
-        result.push(entry.fields || entry.body)
-
-        t.equal(ev, wanted[0], index + " event type")
-        t.equivalent(entry.props, wanted[1], wanted[1].path + " entry properties")
-        if (wanted[2]) {
-          t.equivalent(result[2], wanted[2], "metadata values")
-        }
-        index ++
-      })
-    })
-})
diff --git a/node_modules/tar/test/zz-cleanup.js b/node_modules/tar/test/zz-cleanup.js
deleted file mode 100644
index a00ff7faa0..0000000000
--- a/node_modules/tar/test/zz-cleanup.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// clean up the fixtures
-
-var tap = require("tap")
-, rimraf = require("rimraf")
-, test = tap.test
-, path = require("path")
-
-test("clean fixtures", function (t) {
-  rimraf(path.resolve(__dirname, "fixtures"), function (er) {
-    t.ifError(er, "rimraf ./fixtures/")
-    t.end()
-  })
-})
-
-test("clean tmp", function (t) {
-  rimraf(path.resolve(__dirname, "tmp"), function (er) {
-    t.ifError(er, "rimraf ./tmp/")
-    t.end()
-  })
-})