diff --git a/gpii.js b/gpii.js
index bfc1f5e..41f7bd4 100644
--- a/gpii.js
+++ b/gpii.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii");
 
 require("./index.js");
diff --git a/gpii/node_modules/alsa/alsa_bridge.js b/gpii/node_modules/alsa/alsa_bridge.js
index a80f5ac..cea1387 100644
--- a/gpii/node_modules/alsa/alsa_bridge.js
+++ b/gpii/node_modules/alsa/alsa_bridge.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var alsa = require("./nodealsa/build/Release/nodealsa.node");
 
diff --git a/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js b/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
index bd6c02c..1d74142 100644
--- a/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
+++ b/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     alsa = require("./build/Release/nodealsa.node");
 
diff --git a/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js b/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
index 0f93256..d940fec 100644
--- a/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
+++ b/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("alsa");
diff --git a/gpii/node_modules/gsettingsBridge/gsettings_bridge.js b/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
index 8ce8681..711677c 100644
--- a/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
+++ b/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var nodeGSettings = require("./nodegsettings/build/Release/nodegsettings.node");
 
diff --git a/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js b/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
index e39bc86..55e66ae 100644
--- a/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
+++ b/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
@@ -19,7 +19,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii"),
     jqUnit = fluid.require("node-jqunit");
 
diff --git a/gpii/node_modules/orca/orcaSettingsHandler.js b/gpii/node_modules/orca/orcaSettingsHandler.js
index d52337c..683d850 100644
--- a/gpii/node_modules/orca/orcaSettingsHandler.js
+++ b/gpii/node_modules/orca/orcaSettingsHandler.js
@@ -18,7 +18,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var fs = require("fs");
 var spawn = require("child_process").spawn;
diff --git a/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js b/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
index fef1f70..838b97e 100644
--- a/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
+++ b/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("orca");
diff --git a/gpii/node_modules/packagekit/index.js b/gpii/node_modules/packagekit/index.js
index e497b7d..dddf29e 100644
--- a/gpii/node_modules/packagekit/index.js
+++ b/gpii/node_modules/packagekit/index.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 
 require("./packageKitDeviceReporter.js");
 
diff --git a/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js b/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
index df58763..3115834 100644
--- a/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
+++ b/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
@@ -14,7 +14,7 @@ https://github.com/gpii/universal/LICENSE.txt
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     gpii = fluid.registerNamespace("gpii"),
     packagekit = require("./build/Release/nodepackagekit.node");
diff --git a/gpii/node_modules/packagekit/packageKitDeviceReporter.js b/gpii/node_modules/packagekit/packageKitDeviceReporter.js
index 3f75954..eda347e 100644
--- a/gpii/node_modules/packagekit/packageKitDeviceReporter.js
+++ b/gpii/node_modules/packagekit/packageKitDeviceReporter.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var packageKit = require("./nodepackagekit/build/Release/nodepackagekit.node");
 
diff --git a/gpii/node_modules/packagekit/test/all-tests.js b/gpii/node_modules/packagekit/test/all-tests.js
index f5e88b9..d5e54cc 100644
--- a/gpii/node_modules/packagekit/test/all-tests.js
+++ b/gpii/node_modules/packagekit/test/all-tests.js
@@ -11,7 +11,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     kettle = fluid.require("kettle");
 
 kettle.loadTestingSupport();
diff --git a/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js b/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
index 079057e..8bb845d 100644
--- a/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
+++ b/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
@@ -15,7 +15,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii"),
     jqUnit = fluid.require("node-jqunit");
 
diff --git a/gpii/node_modules/packagekit/test/packageKitModuleTests.js b/gpii/node_modules/packagekit/test/packageKitModuleTests.js
index 5d95122..373ffe9 100644
--- a/gpii/node_modules/packagekit/test/packageKitModuleTests.js
+++ b/gpii/node_modules/packagekit/test/packageKitModuleTests.js
@@ -15,7 +15,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("packagekit");
diff --git a/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js b/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
index 56358be..55068af 100644
--- a/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
+++ b/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     xrandr = require("./build/Release/nodexrandr.node");
 
diff --git a/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js b/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
index 936929b..34c0810 100644
--- a/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
+++ b/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("xrandr");
diff --git a/gpii/node_modules/xrandr/xrandr_bridge.js b/gpii/node_modules/xrandr/xrandr_bridge.js
index b54442f..4154afc 100644
--- a/gpii/node_modules/xrandr/xrandr_bridge.js
+++ b/gpii/node_modules/xrandr/xrandr_bridge.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var xrandr = require("./nodexrandr/build/Release/nodexrandr.node");
 
diff --git a/index.js b/index.js
index cb2ad0b..4aa225b 100644
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 
 fluid.module.register("gpii-linux", __dirname, require);
 
diff --git a/package-lock.json b/package-lock.json
index 3eaf0a1..f7d2b55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,18 +23,18 @@
       }
     },
     "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "requires": {
-        "mime-types": "2.1.17",
+        "mime-types": "2.1.18",
         "negotiator": "0.6.1"
       }
     },
     "acorn": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
-      "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ=="
+      "version": "5.5.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+      "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ=="
     },
     "acorn-jsx": {
       "version": "3.0.1",
@@ -117,12 +117,12 @@
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
         "delegates": "1.0.0",
-        "readable-stream": "2.3.4"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -131,25 +131,25 @@
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         }
       }
@@ -234,15 +234,20 @@
       "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
       "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
     },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "attempt-x": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.1.tgz",
-      "integrity": "sha512-hIp37ojJRRW8ExWSxxLpkDHUufk/DFfsb7/cUC1cVbBg7JV4gJTkCTRa44dlL9e5jx1P3VNrjL7QOQfi4MyltA=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/attempt-x/-/attempt-x-1.1.3.tgz",
+      "integrity": "sha512-y/+ek8IjxVpTbj/phC87jK5YRhlP5Uu7FlQdCmYuut1DTjNruyrGqUWi5bcX1VKsQX1B0FX16A1hqHomKpHv3A=="
     },
     "aws-sign2": {
       "version": "0.6.0",
@@ -250,9 +255,9 @@
       "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
     },
     "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -293,11 +298,12 @@
       "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE="
     },
     "bl": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
-      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
       "requires": {
-        "readable-stream": "2.3.4"
+        "readable-stream": "2.3.6",
+        "safe-buffer": "5.1.2"
       },
       "dependencies": {
         "isarray": {
@@ -306,25 +312,25 @@
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         }
       }
@@ -351,12 +357,12 @@
         "content-type": "1.0.4",
         "debug": "2.6.7",
         "depd": "1.1.2",
-        "http-errors": "1.6.2",
+        "http-errors": "1.6.3",
         "iconv-lite": "0.4.15",
         "on-finished": "2.3.0",
         "qs": "6.4.0",
         "raw-body": "2.2.0",
-        "type-is": "1.6.15"
+        "type-is": "1.6.16"
       }
     },
     "boom": {
@@ -376,6 +382,25 @@
         "concat-map": "0.0.1"
       }
     },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "requires": {
+        "buffer-alloc-unsafe": "1.1.0",
+        "buffer-fill": "1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+    },
     "buffer-from": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.1.tgz",
@@ -396,9 +421,9 @@
       "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk="
     },
     "cached-constructors-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.0.tgz",
-      "integrity": "sha512-JVP0oilYlPgBTD8bkQ+of7hSIJRtydCCJiMtzdRMXVQ98gdj0NyrJTZzbu5wtlO26Ev/1HXRTtbBNsVlLJ3+3A=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cached-constructors-x/-/cached-constructors-x-1.0.2.tgz",
+      "integrity": "sha512-7lKwmwXweW6E/31RHAJemLtZPfb2xvcABXknFF4b/dNYv4DbSGTgQHckXLQkNw6BB4HKFYW6mJgsNjADAy1ehw=="
     },
     "caller-path": {
       "version": "0.1.0",
@@ -552,16 +577,16 @@
       }
     },
     "commander": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
     },
     "commoner": {
       "version": "0.10.8",
       "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
       "integrity": "sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=",
       "requires": {
-        "commander": "2.14.1",
+        "commander": "2.15.1",
         "detective": "4.7.1",
         "glob": "5.0.15",
         "graceful-fs": "4.1.11",
@@ -587,21 +612,21 @@
       }
     },
     "compressible": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz",
-      "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz",
+      "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=",
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "1.33.0"
       }
     },
     "compression": {
       "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz",
+      "resolved": "http://registry.npmjs.org/compression/-/compression-1.6.2.tgz",
       "integrity": "sha1-zOsSHsydCcUtetDDNQ6pPd1AK8M=",
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "bytes": "2.3.0",
-        "compressible": "2.0.12",
+        "compressible": "2.0.13",
         "debug": "2.2.0",
         "on-headers": "1.0.1",
         "vary": "1.1.2"
@@ -689,19 +714,19 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "couchdb-calculate-session-id": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/couchdb-calculate-session-id/-/couchdb-calculate-session-id-1.1.2.tgz",
-      "integrity": "sha1-NkoVao23thIDleo+IQ8k7wwlWhw=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/couchdb-calculate-session-id/-/couchdb-calculate-session-id-1.1.3.tgz",
+      "integrity": "sha512-7RJSTHf8cmeS07oB90LB1Kx7Yxbz/WQJOq9YEKpKJ6Eamca4ovXczMoZs6DlEu01j6DUgW6Z7zQpMxvYaOxskQ==",
       "requires": {
         "aproba": "1.2.0",
-        "base64url": "2.0.0",
+        "base64url": "3.0.0",
         "crypto-lite": "0.2.0"
       },
       "dependencies": {
         "base64url": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
-          "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.0.tgz",
+          "integrity": "sha512-LIVmqIrIWuiqTvn4RzcrwCOuHo2DD6tKmKBPXXlr4p4n4l6BZBkwFTIa3zu1XkX5MbZgro4a6BvPi+n2Mns5Gg=="
         },
         "crypto-lite": {
           "version": "0.2.0",
@@ -920,9 +945,9 @@
       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
     },
     "deep-extend": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
     },
     "deep-is": {
       "version": "0.1.3",
@@ -1001,7 +1026,7 @@
       "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
       "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
       "requires": {
-        "acorn": "5.4.1",
+        "acorn": "5.5.3",
         "defined": "1.0.0"
       }
     },
@@ -1332,16 +1357,16 @@
       "dev": true
     },
     "expand-template": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz",
-      "integrity": "sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz",
+      "integrity": "sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="
     },
     "express": {
       "version": "4.15.4",
       "resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
       "integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
       "requires": {
-        "accepts": "1.3.4",
+        "accepts": "1.3.5",
         "array-flatten": "1.1.1",
         "content-disposition": "0.5.2",
         "content-type": "1.0.4",
@@ -1366,7 +1391,7 @@
         "serve-static": "1.12.4",
         "setprototypeof": "1.0.3",
         "statuses": "1.3.1",
-        "type-is": "1.6.15",
+        "type-is": "1.6.16",
         "utils-merge": "1.0.0",
         "vary": "1.1.2"
       },
@@ -1384,6 +1409,11 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
           "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg=="
         },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -1430,12 +1460,12 @@
             "content-type": "1.0.4",
             "debug": "2.6.1",
             "depd": "1.1.2",
-            "http-errors": "1.6.2",
+            "http-errors": "1.6.3",
             "iconv-lite": "0.4.15",
             "on-finished": "2.3.0",
             "qs": "6.4.0",
             "raw-body": "2.2.0",
-            "type-is": "1.6.15"
+            "type-is": "1.6.16"
           },
           "dependencies": {
             "raw-body": {
@@ -1743,7 +1773,7 @@
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
-        "mime-types": "2.1.17"
+        "mime-types": "2.1.18"
       }
     },
     "forwarded": {
@@ -1756,6 +1786,11 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
       "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44="
     },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1851,7 +1886,7 @@
       "requires": {
         "after": "0.8.2",
         "ghrepos": "2.1.0",
-        "ghutils": "3.2.2",
+        "ghutils": "3.2.4",
         "simple-mime": "0.1.0",
         "url-template": "2.0.8",
         "xtend": "4.0.1"
@@ -1862,13 +1897,13 @@
       "resolved": "https://registry.npmjs.org/ghrepos/-/ghrepos-2.1.0.tgz",
       "integrity": "sha512-6GM0ohSDTAv7xD6GsKfxJiV/CajoofRyUwu0E8l29d1o6lFAUxmmyMP/FH33afA20ZrXzxxcTtN6TsYvudMoAg==",
       "requires": {
-        "ghutils": "3.2.2"
+        "ghutils": "3.2.4"
       }
     },
     "ghutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/ghutils/-/ghutils-3.2.2.tgz",
-      "integrity": "sha512-6SqTlzs89EtYRlafY8oavTnn/vEErgRSnMsuFDwOzNgK34mpHXTBinh6rTx6xwqei3d3BWyrSTQ8uN9kPpEQtg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ghutils/-/ghutils-3.2.4.tgz",
+      "integrity": "sha512-6JQVg+iHj/O4bJ/qqk8zc/ULu/I8sgfbFmHb1U12gWblRnXkidKurvBaCZMXTM7W1qAcT//X+hTJX8ZASoJ7BA==",
       "requires": {
         "jsonist": "2.1.0",
         "xtend": "4.0.1"
@@ -1946,7 +1981,7 @@
           "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
           "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
           "requires": {
-            "accepts": "1.3.4",
+            "accepts": "1.3.5",
             "array-flatten": "1.1.1",
             "content-disposition": "0.5.2",
             "content-type": "1.0.4",
@@ -1971,7 +2006,7 @@
             "serve-static": "1.12.3",
             "setprototypeof": "1.0.3",
             "statuses": "1.3.1",
-            "type-is": "1.6.15",
+            "type-is": "1.6.16",
             "utils-merge": "1.0.0",
             "vary": "1.1.2"
           }
@@ -1996,7 +2031,7 @@
             "escape-html": "1.0.3",
             "etag": "1.8.1",
             "fresh": "0.5.0",
-            "http-errors": "1.6.2",
+            "http-errors": "1.6.3",
             "mime": "1.3.4",
             "ms": "2.0.0",
             "on-finished": "2.3.0",
@@ -2015,6 +2050,11 @@
             "send": "0.15.3"
           }
         },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -2044,7 +2084,7 @@
           "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
           "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
           "requires": {
-            "accepts": "1.3.4",
+            "accepts": "1.3.5",
             "array-flatten": "1.1.1",
             "content-disposition": "0.5.2",
             "content-type": "1.0.4",
@@ -2069,7 +2109,7 @@
             "serve-static": "1.12.3",
             "setprototypeof": "1.0.3",
             "statuses": "1.3.1",
-            "type-is": "1.6.15",
+            "type-is": "1.6.16",
             "utils-merge": "1.0.0",
             "vary": "1.1.2"
           }
@@ -2094,7 +2134,7 @@
             "escape-html": "1.0.3",
             "etag": "1.8.1",
             "fresh": "0.5.0",
-            "http-errors": "1.6.2",
+            "http-errors": "1.6.3",
             "mime": "1.3.4",
             "ms": "2.0.0",
             "on-finished": "2.3.0",
@@ -2113,6 +2153,11 @@
             "send": "0.15.3"
           }
         },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        },
         "statuses": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
@@ -2120,6 +2165,354 @@
         }
       }
     },
+    "gpii-universal": {
+      "version": "0.3.0-dev.20180221T093422Z.50833c1",
+      "resolved": "https://registry.npmjs.org/gpii-universal/-/gpii-universal-0.3.0-dev.20180221T093422Z.50833c1.tgz",
+      "integrity": "sha512-KDbv2kwnW7fNQBvPWD58TdfUP7Ytg9cEL8iiMIQVe9R54ixzA8nQJVPdQelE/09L+hZRjLrhDFK28jDbxTV0eQ==",
+      "requires": {
+        "body-parser": "1.17.2",
+        "connect-ensure-login": "0.1.1",
+        "express": "4.15.4",
+        "fluid-resolve": "1.3.0",
+        "glob": "7.1.2",
+        "gpii-pouchdb": "1.0.7",
+        "infusion": "3.0.0-dev.20180221T012810Z.29c3e67",
+        "ini": "git://github.com/GPII/ini.git#be8a04aa22f5ad9321ebcbba7740314a53bc8ab2",
+        "json5": "0.5.1",
+        "kettle": "1.7.1",
+        "mkdirp": "0.5.1",
+        "nock": "9.1.0",
+        "node-jqunit": "1.1.8",
+        "node-uuid": "1.4.8",
+        "oauth2orize": "1.8.0",
+        "passport": "0.3.2",
+        "passport-oauth2-client-password": "0.1.2",
+        "rimraf": "2.6.1",
+        "semver": "5.4.1",
+        "write-file-atomic": "2.3.0",
+        "xml-mapping": "1.7.1"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+        },
+        "cookie-parser": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz",
+          "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=",
+          "requires": {
+            "cookie": "0.3.1",
+            "cookie-signature": "1.0.6"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "express-session": {
+          "version": "1.15.6",
+          "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz",
+          "integrity": "sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==",
+          "requires": {
+            "cookie": "0.3.1",
+            "cookie-signature": "1.0.6",
+            "crc": "3.4.4",
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "on-headers": "1.0.1",
+            "parseurl": "1.3.2",
+            "uid-safe": "2.1.5",
+            "utils-merge": "1.0.1"
+          }
+        },
+        "finalhandler": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+          "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "statuses": {
+              "version": "1.3.1",
+              "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+              "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
+            }
+          }
+        },
+        "fresh": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+          "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+        },
+        "iconv-lite": {
+          "version": "0.4.19",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+        },
+        "infusion": {
+          "version": "3.0.0-dev.20180221T012810Z.29c3e67",
+          "resolved": "https://registry.npmjs.org/infusion/-/infusion-3.0.0-dev.20180221T012810Z.29c3e67.tgz",
+          "integrity": "sha512-9Nu2qqYNvaapLKU6OBTWZbwBfcDh38PBDYc//1aEadjtUCn+ciVF0ySwJrYKaqTqaWNL8tbWUWio4Bx7c771fg==",
+          "requires": {
+            "fluid-resolve": "1.3.0"
+          }
+        },
+        "ipaddr.js": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
+          "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs="
+        },
+        "kettle": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/kettle/-/kettle-1.7.1.tgz",
+          "integrity": "sha1-T0UJs9ymqjufG99tTucI/+C9P74=",
+          "requires": {
+            "body-parser": "1.18.2",
+            "cookie-parser": "1.4.3",
+            "express": "4.16.2",
+            "express-session": "1.15.6",
+            "fluid-resolve": "1.3.0",
+            "infusion": "3.0.0-dev.20171117T095227Z.67ff934",
+            "json5": "0.5.1",
+            "jsonlint": "1.6.2",
+            "path-to-regexp": "1.7.0",
+            "serve-static": "1.13.1",
+            "ws": "3.3.1"
+          },
+          "dependencies": {
+            "body-parser": {
+              "version": "1.18.2",
+              "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+              "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+              "requires": {
+                "bytes": "3.0.0",
+                "content-type": "1.0.4",
+                "debug": "2.6.9",
+                "depd": "1.1.2",
+                "http-errors": "1.6.3",
+                "iconv-lite": "0.4.19",
+                "on-finished": "2.3.0",
+                "qs": "6.5.1",
+                "raw-body": "2.3.2",
+                "type-is": "1.6.16"
+              }
+            },
+            "express": {
+              "version": "4.16.2",
+              "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
+              "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+              "requires": {
+                "accepts": "1.3.5",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.18.2",
+                "content-disposition": "0.5.2",
+                "content-type": "1.0.4",
+                "cookie": "0.3.1",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "1.1.2",
+                "encodeurl": "1.0.2",
+                "escape-html": "1.0.3",
+                "etag": "1.8.1",
+                "finalhandler": "1.1.0",
+                "fresh": "0.5.2",
+                "merge-descriptors": "1.0.1",
+                "methods": "1.1.2",
+                "on-finished": "2.3.0",
+                "parseurl": "1.3.2",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "2.0.3",
+                "qs": "6.5.1",
+                "range-parser": "1.2.0",
+                "safe-buffer": "5.1.1",
+                "send": "0.16.1",
+                "serve-static": "1.13.1",
+                "setprototypeof": "1.1.0",
+                "statuses": "1.3.1",
+                "type-is": "1.6.16",
+                "utils-merge": "1.0.1",
+                "vary": "1.1.2"
+              },
+              "dependencies": {
+                "path-to-regexp": {
+                  "version": "0.1.7",
+                  "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+                  "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+                }
+              }
+            },
+            "infusion": {
+              "version": "3.0.0-dev.20171117T095227Z.67ff934",
+              "resolved": "https://registry.npmjs.org/infusion/-/infusion-3.0.0-dev.20171117T095227Z.67ff934.tgz",
+              "integrity": "sha1-0Ng2s0OqbbiMDez+rnHmJ11BQg4=",
+              "requires": {
+                "fluid-resolve": "1.3.0"
+              }
+            },
+            "setprototypeof": {
+              "version": "1.1.0",
+              "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+              "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+            },
+            "statuses": {
+              "version": "1.3.1",
+              "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+              "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
+            }
+          }
+        },
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+        },
+        "node-jqunit": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/node-jqunit/-/node-jqunit-1.1.8.tgz",
+          "integrity": "sha1-Wq1LJ5hHVMoPZ1AmNPEwAt6+GNM=",
+          "requires": {
+            "infusion": "3.0.0-dev.20171117T095227Z.67ff934"
+          },
+          "dependencies": {
+            "infusion": {
+              "version": "3.0.0-dev.20171117T095227Z.67ff934",
+              "resolved": "https://registry.npmjs.org/infusion/-/infusion-3.0.0-dev.20171117T095227Z.67ff934.tgz",
+              "integrity": "sha1-0Ng2s0OqbbiMDez+rnHmJ11BQg4=",
+              "requires": {
+                "fluid-resolve": "1.3.0"
+              }
+            }
+          }
+        },
+        "path-to-regexp": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        },
+        "proxy-addr": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
+          "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
+          "requires": {
+            "forwarded": "0.1.2",
+            "ipaddr.js": "1.6.0"
+          }
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+        },
+        "raw-body": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+          "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+          "requires": {
+            "bytes": "3.0.0",
+            "http-errors": "1.6.2",
+            "iconv-lite": "0.4.19",
+            "unpipe": "1.0.0"
+          },
+          "dependencies": {
+            "depd": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+              "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+            },
+            "http-errors": {
+              "version": "1.6.2",
+              "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+              "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+              "requires": {
+                "depd": "1.1.1",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.0.3",
+                "statuses": "1.5.0"
+              }
+            }
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+        },
+        "send": {
+          "version": "0.16.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
+          "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+          "requires": {
+            "debug": "2.6.9",
+            "depd": "1.1.2",
+            "destroy": "1.0.4",
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "etag": "1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "1.6.3",
+            "mime": "1.4.1",
+            "ms": "2.0.0",
+            "on-finished": "2.3.0",
+            "range-parser": "1.2.0",
+            "statuses": "1.3.1"
+          },
+          "dependencies": {
+            "statuses": {
+              "version": "1.3.1",
+              "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+              "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
+            }
+          }
+        },
+        "serve-static": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
+          "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+          "requires": {
+            "encodeurl": "1.0.2",
+            "escape-html": "1.0.3",
+            "parseurl": "1.3.2",
+            "send": "0.16.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+        },
+        "utils-merge": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+          "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+        },
+        "ws": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz",
+          "integrity": "sha512-8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==",
+          "requires": {
+            "async-limiter": "1.0.0",
+            "safe-buffer": "5.1.1",
+            "ultron": "1.1.1"
+          }
+        }
+      }
+    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -2357,7 +2750,7 @@
       "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
       "requires": {
         "chalk": "1.1.3",
-        "commander": "2.14.1",
+        "commander": "2.15.1",
         "is-my-json-valid": "2.17.2",
         "pinkie-promise": "2.0.1"
       }
@@ -2386,22 +2779,22 @@
       "resolved": "https://registry.npmjs.org/has-own-property-x/-/has-own-property-x-3.2.0.tgz",
       "integrity": "sha512-HtRQTYpRFz/YVaQ7jh2mU5iorMAxFcML9FNOLMI1f8VNJ2K0hpOlXoi1a+nmVl6oUcGnhd6zYOFAVe7NUFStyQ==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
+        "cached-constructors-x": "1.0.2",
         "to-object-x": "1.5.0",
         "to-property-key-x": "2.0.2"
       }
     },
     "has-symbol-support-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
-      "integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
     },
     "has-to-string-tag-x": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
       "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
       "requires": {
-        "has-symbol-support-x": "1.4.1"
+        "has-symbol-support-x": "1.4.2"
       }
     },
     "has-unicode": {
@@ -2443,21 +2836,14 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "requires": {
-        "depd": "1.1.1",
+        "depd": "1.1.2",
         "inherits": "2.0.3",
-        "setprototypeof": "1.0.3",
-        "statuses": "1.4.0"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
-        }
+        "setprototypeof": "1.1.0",
+        "statuses": "1.5.0"
       }
     },
     "http-signature": {
@@ -2467,7 +2853,7 @@
       "requires": {
         "assert-plus": "0.2.0",
         "jsprim": "1.4.1",
-        "sshpk": "1.13.1"
+        "sshpk": "1.14.1"
       }
     },
     "hyperquest": {
@@ -2519,9 +2905,9 @@
       }
     },
     "infinity-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.0.tgz",
-      "integrity": "sha512-wjy2TupBtZ+aAniKt+xs/PO0xOkuaL6wBysUKbgD7aL1PMW/qY5xXDG59zXZ7dU+gk3zwXOu4yIEWPCEFBTgHQ=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.2.tgz",
+      "integrity": "sha512-2Ioz+exrAwlHxFBaDHQIbvUyjKFt0YjIal34/agfzx738aT1zBQwSU5A8Zgb1IQ2r24BtXrkeZZusxE40MyZaQ=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -2536,6 +2922,7 @@
       "version": "3.0.0-dev.20170830T182157Z.392b2f8",
       "resolved": "https://registry.npmjs.org/infusion/-/infusion-3.0.0-dev.20170830T182157Z.392b2f8.tgz",
       "integrity": "sha1-9OuvAM/uGpxX0FbuYMXi7vFTLok=",
+      "dev": true,
       "requires": {
         "fluid-resolve": "1.3.0"
       }
@@ -2593,11 +2980,11 @@
       "resolved": "https://registry.npmjs.org/is-array-buffer-x/-/is-array-buffer-x-1.7.0.tgz",
       "integrity": "sha512-ufSZRMY2WZX5xyNvk0NOZAG7cgi35B/sGQDGqv8w0X7MoQ2GC9vedanJhuYTPaC4PUCqLQsda1w7NF+dPZmAJw==",
       "requires": {
-        "attempt-x": "1.1.1",
+        "attempt-x": "1.1.3",
         "has-to-string-tag-x": "1.4.1",
-        "is-object-like-x": "1.6.0",
+        "is-object-like-x": "1.7.1",
         "object-get-own-property-descriptor-x": "3.2.0",
-        "to-string-tag-x": "1.4.2"
+        "to-string-tag-x": "1.4.3"
       }
     },
     "is-arrayish": {
@@ -2632,11 +3019,11 @@
       "integrity": "sha1-Cf3D1kndpZaRVsCFOpt2vXgcWjM="
     },
     "is-falsey-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.1.tgz",
-      "integrity": "sha512-XWNZC4A+3FX1ECoMjspuEFgSdio82IWjqY/suE0gZ10QA7nzHd/KraRq7Tc5VEHtFRgTRyTdY6W+ykPrDnyoAQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-falsey-x/-/is-falsey-x-1.0.3.tgz",
+      "integrity": "sha512-RWjusR6LXAhGa0Vus7aD1rwJuJwdJsvG3daAVMDvOAgvGuGm4eilNgoSuXhpv2/2qpLDvioAKTNb3t3XYidCNg==",
       "requires": {
-        "to-boolean-x": "1.0.1"
+        "to-boolean-x": "1.0.3"
       }
     },
     "is-finite": {
@@ -2648,12 +3035,12 @@
       }
     },
     "is-finite-x": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.2.tgz",
-      "integrity": "sha512-HyFrxJZsgmP5RtR1PVlVvHSP4VslZOqr4uoq4x3rDrSOFaYp4R9tfmiWtAzQxPzixXhac3cYEno3NuVn0OHk2Q==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/is-finite-x/-/is-finite-x-3.0.4.tgz",
+      "integrity": "sha512-wdSI5zk/Pl21HzGcLWFoFzuDa8gsgcqhwZGAZryL2eU7RKf7+g+q4jL2gGItrBs/YtspkjOrJ4JxXNZqquoAWA==",
       "requires": {
-        "infinity-x": "1.0.0",
-        "is-nan-x": "1.0.1"
+        "infinity-x": "1.0.2",
+        "is-nan-x": "1.0.3"
       }
     },
     "is-fullwidth-code-point": {
@@ -2670,14 +3057,21 @@
       "resolved": "https://registry.npmjs.org/is-function-x/-/is-function-x-3.3.0.tgz",
       "integrity": "sha512-SreSSU1dlgYaXR5c0mm4qJHKYHIiGiEY+7Cd8/aRLLoMP/VvofD2XcWgBnP833ajpU5XzXbUSpfysnfKZLJFlg==",
       "requires": {
-        "attempt-x": "1.1.1",
+        "attempt-x": "1.1.3",
         "has-to-string-tag-x": "1.4.1",
-        "is-falsey-x": "1.0.1",
+        "is-falsey-x": "1.0.3",
         "is-primitive": "2.0.0",
         "normalize-space-x": "3.0.0",
         "replace-comments-x": "2.0.0",
-        "to-boolean-x": "1.0.1",
-        "to-string-tag-x": "1.4.2"
+        "to-boolean-x": "1.0.3",
+        "to-string-tag-x": "1.4.3"
+      },
+      "dependencies": {
+        "is-primitive": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+        }
       }
     },
     "is-index-x": {
@@ -2689,7 +3083,7 @@
         "max-safe-integer": "1.0.1",
         "to-integer-x": "3.0.0",
         "to-number-x": "2.0.0",
-        "to-string-symbols-supported-x": "1.0.0"
+        "to-string-symbols-supported-x": "1.0.2"
       }
     },
     "is-my-ip-valid": {
@@ -2710,26 +3104,26 @@
       }
     },
     "is-nan-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.1.tgz",
-      "integrity": "sha512-VfNJgfuT8USqKCYQss8g7sFvCzDnL+OOVMQoXhVoulZAyp0ZTj3oyZaaPrn2dxepAkKSQI2BiKHbBabX1DqVtw=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-nan-x/-/is-nan-x-1.0.3.tgz",
+      "integrity": "sha512-WenNBLVGSZID8shogsB++42vF7gvotCfneXM9KMCAKwNPXa8VfAu/RWwpqvnK7dLOP4Z7uitocb0TZ6rAiOccA=="
     },
     "is-nil-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.1.tgz",
-      "integrity": "sha512-cfTKWI5iSR04SSCzzugTH5tS2rYG7kwI8yl/AqWkyuxZ7k55cbA47Y7Lezdg1N9aaELd+UxLg628bdQeNQ6BUw==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/is-nil-x/-/is-nil-x-1.4.2.tgz",
+      "integrity": "sha512-9aDY7ir7IGb5HlgqL+b38v2YMxf8S7MEHHxjHGzUhijg2crq47RKdxL37bS6dU0VN87wy2IBZP4akgQtIXmyvg==",
       "requires": {
         "lodash.isnull": "3.0.0",
         "validate.io-undefined": "1.0.3"
       }
     },
     "is-object-like-x": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.6.0.tgz",
-      "integrity": "sha512-mc3dBMv1jEOdk0f1i2RkJFsZDux0MuHqGwHOoRo770ShUOf4VE6tWThAW8dAZARr9a5RN+iNX1yzMDA5ad1clQ==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/is-object-like-x/-/is-object-like-x-1.7.1.tgz",
+      "integrity": "sha512-89nz+kESAW2Y7udq+PdRX/dZnRN2WP1b19Gdv4OYE1Xjoekn1xf31l0ZPzT40qdPD7I2nveNFm9rxxI0vmnGHA==",
       "requires": {
         "is-function-x": "3.3.0",
-        "is-primitive": "2.0.0"
+        "is-primitive": "3.0.0"
       }
     },
     "is-path-cwd": {
@@ -2757,9 +3151,9 @@
       }
     },
     "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.0.tgz",
+      "integrity": "sha512-Qch+MMfMdu7DMY6XElM7LUJKPmkbXdTqNhqyehVflzis2a8Zd9V6U8qZybb32uUSmlO/dNmg3fsA5t0Q9TC0mA=="
     },
     "is-property": {
       "version": "1.0.2",
@@ -2934,7 +3328,7 @@
       "resolved": "https://registry.npmjs.org/jsonist/-/jsonist-2.1.0.tgz",
       "integrity": "sha1-RHek0WzTd/rsWNjPhwt+OS9tf+k=",
       "requires": {
-        "bl": "1.2.1",
+        "bl": "1.2.2",
         "hyperquest": "2.1.3",
         "json-stringify-safe": "5.0.1",
         "xtend": "4.0.1"
@@ -2982,113 +3376,6 @@
         "source-map": "0.1.31"
       }
     },
-    "kettle": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/kettle/-/kettle-1.7.0.tgz",
-      "integrity": "sha1-Yb40SG6rp2LOV/MKR1cCR8ZIyvI=",
-      "requires": {
-        "body-parser": "1.17.2",
-        "cookie-parser": "1.4.3",
-        "express": "4.15.4",
-        "express-session": "1.15.5",
-        "fluid-resolve": "1.3.0",
-        "infusion": "3.0.0-dev.20170830T182157Z.392b2f8",
-        "json5": "0.5.1",
-        "jsonlint": "1.6.2",
-        "path-to-regexp": "1.7.0",
-        "serve-static": "1.12.3",
-        "ws": "3.1.0"
-      },
-      "dependencies": {
-        "cookie-parser": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz",
-          "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=",
-          "requires": {
-            "cookie": "0.3.1",
-            "cookie-signature": "1.0.6"
-          }
-        },
-        "debug": {
-          "version": "2.6.8",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "express-session": {
-          "version": "1.15.5",
-          "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.5.tgz",
-          "integrity": "sha512-BBVy6E/XqjB507wqe5T+7Ia2N/gtur/dT/fKmvGGKQqUrzI4dcBPGJgV4t2ciX7FoxZPhZcKTDTmb4+5nCyQOw==",
-          "requires": {
-            "cookie": "0.3.1",
-            "cookie-signature": "1.0.6",
-            "crc": "3.4.4",
-            "debug": "2.6.8",
-            "depd": "1.1.2",
-            "on-headers": "1.0.1",
-            "parseurl": "1.3.2",
-            "uid-safe": "2.1.5",
-            "utils-merge": "1.0.0"
-          }
-        },
-        "path-to-regexp": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
-          "requires": {
-            "isarray": "0.0.1"
-          }
-        },
-        "send": {
-          "version": "0.15.3",
-          "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
-          "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
-          "requires": {
-            "debug": "2.6.7",
-            "depd": "1.1.2",
-            "destroy": "1.0.4",
-            "encodeurl": "1.0.2",
-            "escape-html": "1.0.3",
-            "etag": "1.8.1",
-            "fresh": "0.5.0",
-            "http-errors": "1.6.2",
-            "mime": "1.3.4",
-            "ms": "2.0.0",
-            "on-finished": "2.3.0",
-            "range-parser": "1.2.0",
-            "statuses": "1.3.1"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "2.6.7",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-              "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
-              "requires": {
-                "ms": "2.0.0"
-              }
-            }
-          }
-        },
-        "serve-static": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
-          "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
-          "requires": {
-            "encodeurl": "1.0.2",
-            "escape-html": "1.0.3",
-            "parseurl": "1.3.2",
-            "send": "0.15.3"
-          }
-        },
-        "statuses": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
-        }
-      }
-    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3280,7 +3567,7 @@
       "resolved": "https://registry.npmjs.org/math-sign-x/-/math-sign-x-3.0.0.tgz",
       "integrity": "sha512-OzPas41Pn4d16KHnaXmGxxY3/l3zK4OIXtmIwdhgZsxz4FDDcNnbrABYPg2vGfxIkaT9ezGnzDviRH7RfF44jQ==",
       "requires": {
-        "is-nan-x": "1.0.1",
+        "is-nan-x": "1.0.3",
         "to-number-x": "2.0.0"
       }
     },
@@ -3352,16 +3639,16 @@
       "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM="
     },
     "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
     },
     "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "1.33.0"
       }
     },
     "minimatch": {
@@ -3411,9 +3698,9 @@
       "integrity": "sha1-+zxZ1F/k7/4hXwuJD4rfbrMtIjI="
     },
     "nan-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.0.tgz",
-      "integrity": "sha512-yw4Fhe2/UTzanQ4f0yHWkRnfTuHZFAi4GZDjXS4G+qv5BqXTqPJBbSxpa7MyyW9v4Y4ZySZQik1vcbNkhdnIOg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nan-x/-/nan-x-1.0.2.tgz",
+      "integrity": "sha512-dndRmy03JQEN+Nh6WjQl7/OstIozeEmrtWe4TE7mEqJ8W8oMD8m2tHjsLPWt//e3hLAeRSbs4pxMyc5pk/nCkQ=="
     },
     "negotiator": {
       "version": "0.6.1",
@@ -3448,7 +3735,7 @@
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "npmlog": "2.0.4",
-        "osenv": "0.1.4",
+        "osenv": "0.1.5",
         "request": "2.79.0",
         "rimraf": "2.6.1",
         "semver": "5.3.0",
@@ -3467,6 +3754,7 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/node-jqunit/-/node-jqunit-1.1.7.tgz",
       "integrity": "sha1-p0Vla55y9G44f0mN+3AlxtNpqBk=",
+      "dev": true,
       "requires": {
         "infusion": "3.0.0-dev.20170830T182157Z.392b2f8"
       }
@@ -3483,7 +3771,7 @@
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "npmlog": "2.0.4",
-        "osenv": "0.1.4",
+        "osenv": "0.1.5",
         "path-array": "1.0.1",
         "request": "2.79.0",
         "rimraf": "2.6.1",
@@ -3558,9 +3846,9 @@
       "resolved": "https://registry.npmjs.org/normalize-space-x/-/normalize-space-x-3.0.0.tgz",
       "integrity": "sha512-tbCJerqZCCHPst4rRKgsTanLf45fjOyeAU5zE3mhDxJtFJKt66q39g2XArWhXelgTFVib8mNBUm6Wrd0LxYcfQ==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
+        "cached-constructors-x": "1.0.2",
         "trim-x": "3.0.0",
-        "white-space-x": "3.0.0"
+        "white-space-x": "3.0.1"
       }
     },
     "npm-run-path": {
@@ -3578,7 +3866,7 @@
       "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=",
       "requires": {
         "ansi": "0.3.1",
-        "are-we-there-yet": "1.1.4",
+        "are-we-there-yet": "1.1.5",
         "gauge": "1.2.7"
       }
     },
@@ -3612,16 +3900,23 @@
       "resolved": "https://registry.npmjs.org/object-get-own-property-descriptor-x/-/object-get-own-property-descriptor-x-3.2.0.tgz",
       "integrity": "sha512-Z/0fIrptD9YuzN+SNK/1kxAEaBcPQM4gSrtOSMSi9eplnL/AbyQcAyAlreAoAzmBon+DQ1Z+AdhxyQSvav5Fyg==",
       "requires": {
-        "attempt-x": "1.1.1",
+        "attempt-x": "1.1.3",
         "has-own-property-x": "3.2.0",
-        "has-symbol-support-x": "1.4.1",
-        "is-falsey-x": "1.0.1",
+        "has-symbol-support-x": "1.4.2",
+        "is-falsey-x": "1.0.3",
         "is-index-x": "1.1.0",
         "is-primitive": "2.0.0",
         "is-string": "1.0.4",
         "property-is-enumerable-x": "1.1.0",
         "to-object-x": "1.5.0",
         "to-property-key-x": "2.0.2"
+      },
+      "dependencies": {
+        "is-primitive": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+        }
       }
     },
     "object-keys": {
@@ -3699,9 +3994,9 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
         "os-homedir": "1.0.2",
         "os-tmpdir": "1.0.2"
@@ -3712,9 +4007,9 @@
       "resolved": "https://registry.npmjs.org/parse-int-x/-/parse-int-x-2.0.0.tgz",
       "integrity": "sha512-NIMm52gmd1+0qxJK8lV3OZ4zzWpRH1xcz9xCHXl+DNzddwUdS4NEtd7BmTeK7iCIXoaK5e6BoDMHgieH2eNIhg==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "nan-x": "1.0.0",
-        "to-string-x": "1.4.2",
+        "cached-constructors-x": "1.0.2",
+        "nan-x": "1.0.2",
+        "to-string-x": "1.4.5",
         "trim-left-x": "3.0.0"
       }
     },
@@ -3965,7 +4260,7 @@
       "integrity": "sha1-X04iFvQk3h1cpQ9LTOt2Jc1YllQ=",
       "requires": {
         "base64url": "1.0.6",
-        "couchdb-calculate-session-id": "1.1.2",
+        "couchdb-calculate-session-id": "1.1.3",
         "crypto-lite": "0.1.0",
         "pouchdb-bulkdocs-wrapper": "1.0.2",
         "pouchdb-plugin-error": "1.0.1",
@@ -4042,9 +4337,9 @@
       },
       "dependencies": {
         "base62": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/base62/-/base62-1.2.7.tgz",
-          "integrity": "sha512-ck0nDbXLEq2nD5jIcEzdpk07sYQ5P6z4NMTIgeQCFr5CCRZzmgUPlOes4o0k5pvEUQJnKO/D079ybzjpjIKf2Q=="
+          "version": "1.2.8",
+          "resolved": "https://registry.npmjs.org/base62/-/base62-1.2.8.tgz",
+          "integrity": "sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA=="
         },
         "es3ify": {
           "version": "0.2.2",
@@ -4066,7 +4361,7 @@
           "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-11.0.3.tgz",
           "integrity": "sha1-CaeJk+CuTU70SH9hVakfYZDLQiM=",
           "requires": {
-            "base62": "1.2.7",
+            "base62": "1.2.8",
             "commoner": "0.10.8",
             "esprima-fb": "15001.1.0-dev-harmony-fb",
             "object-assign": "2.1.1",
@@ -4166,9 +4461,9 @@
       },
       "dependencies": {
         "base62": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/base62/-/base62-1.2.7.tgz",
-          "integrity": "sha512-ck0nDbXLEq2nD5jIcEzdpk07sYQ5P6z4NMTIgeQCFr5CCRZzmgUPlOes4o0k5pvEUQJnKO/D079ybzjpjIKf2Q=="
+          "version": "1.2.8",
+          "resolved": "https://registry.npmjs.org/base62/-/base62-1.2.8.tgz",
+          "integrity": "sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA=="
         },
         "es3ify": {
           "version": "0.2.2",
@@ -4190,7 +4485,7 @@
           "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-11.0.3.tgz",
           "integrity": "sha1-CaeJk+CuTU70SH9hVakfYZDLQiM=",
           "requires": {
-            "base62": "1.2.7",
+            "base62": "1.2.8",
             "commoner": "0.10.8",
             "esprima-fb": "15001.1.0-dev-harmony-fb",
             "object-assign": "2.1.1",
@@ -4273,7 +4568,7 @@
         "header-case-normalizer": "1.0.3",
         "pouchdb-plugin-error": "1.0.1",
         "pouchdb-promise": "0.0.0",
-        "xmlhttprequest-cookie": "0.9.5"
+        "xmlhttprequest-cookie": "0.9.6"
       },
       "dependencies": {
         "bluebird": {
@@ -4535,7 +4830,7 @@
       "requires": {
         "async": "1.5.2",
         "execspawn": "1.0.1",
-        "expand-template": "1.1.0",
+        "expand-template": "1.1.1",
         "ghreleases": "1.0.7",
         "github-from-package": "0.0.0",
         "minimist": "1.2.0",
@@ -4546,10 +4841,10 @@
         "npmlog": "2.0.4",
         "os-homedir": "1.0.2",
         "pump": "1.0.3",
-        "rc": "1.2.5",
+        "rc": "1.2.8",
         "simple-get": "1.4.3",
-        "tar-fs": "1.16.0",
-        "tar-stream": "1.5.5",
+        "tar-fs": "1.16.2",
+        "tar-stream": "1.6.1",
         "xtend": "4.0.1"
       },
       "dependencies": {
@@ -4670,11 +4965,11 @@
       }
     },
     "rc": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz",
-      "integrity": "sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
       "requires": {
-        "deep-extend": "0.4.2",
+        "deep-extend": "0.6.0",
         "ini": "1.3.5",
         "minimist": "1.2.0",
         "strip-json-comments": "2.0.1"
@@ -4807,8 +5102,8 @@
       "resolved": "https://registry.npmjs.org/replace-comments-x/-/replace-comments-x-2.0.0.tgz",
       "integrity": "sha512-+vMP4jqU+8HboLWms6YMNEiaZG5hh1oR6ENCnGYDF/UQ7aYiJUK/8tcl3+KZAHRCKKa3gqzrfiarlUBHQSgRlg==",
       "requires": {
-        "require-coercible-to-string-x": "1.0.0",
-        "to-string-x": "1.4.2"
+        "require-coercible-to-string-x": "1.0.2",
+        "to-string-x": "1.4.5"
       }
     },
     "request": {
@@ -4817,7 +5112,7 @@
       "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
       "requires": {
         "aws-sign2": "0.6.0",
-        "aws4": "1.6.0",
+        "aws4": "1.7.0",
         "caseless": "0.11.0",
         "combined-stream": "1.0.6",
         "extend": "3.0.1",
@@ -4829,11 +5124,11 @@
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
         "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.17",
+        "mime-types": "2.1.18",
         "oauth-sign": "0.8.2",
         "qs": "6.3.2",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.3",
+        "stringstream": "0.0.6",
+        "tough-cookie": "2.3.4",
         "tunnel-agent": "0.4.3",
         "uuid": "3.2.1"
       },
@@ -4856,20 +5151,20 @@
       }
     },
     "require-coercible-to-string-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.0.tgz",
-      "integrity": "sha512-Rpfd4sMdflPAKecdKhfAtQHlZzzle4UMUgxJ01hXtTcNWMV8w9GeZnKhEyrT73kgrflBOP1zg41amUPZGcNspA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/require-coercible-to-string-x/-/require-coercible-to-string-x-1.0.2.tgz",
+      "integrity": "sha512-GZ3BSCL0n/zhho8ITganW9FGPh0Kxhq71nCjck8Qau/30Wf4Po8a3XpQdzEMFiXCwZ/0m0E3lKSdSG8gkcIofQ==",
       "requires": {
-        "require-object-coercible-x": "1.4.1",
-        "to-string-x": "1.4.2"
+        "require-object-coercible-x": "1.4.3",
+        "to-string-x": "1.4.5"
       }
     },
     "require-object-coercible-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.1.tgz",
-      "integrity": "sha512-0YHa2afepsLfQvwQ1P2XvDZnGOUia5sC07ZijIRU2dnsRxnuilXWF6B2CFaKGDA9eZl39lJHrXCDsnfgroRd6Q==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/require-object-coercible-x/-/require-object-coercible-x-1.4.3.tgz",
+      "integrity": "sha512-5wEaS+NIiU5HLJQTqBQ+6XHtX7yplUS374j/H/nRDlc7rMWfENqp026jnUHWAOCZ+ekixkXuFHEnTF28oqqVLA==",
       "requires": {
-        "is-nil-x": "1.4.1"
+        "is-nil-x": "1.4.2"
       }
     },
     "require-uncached": {
@@ -4938,9 +5233,9 @@
       "dev": true
     },
     "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "sax": {
       "version": "0.4.2",
@@ -4974,7 +5269,7 @@
         "escape-html": "1.0.3",
         "etag": "1.8.1",
         "fresh": "0.5.0",
-        "http-errors": "1.6.2",
+        "http-errors": "1.6.3",
         "mime": "1.3.4",
         "ms": "2.0.0",
         "on-finished": "2.3.0",
@@ -5009,9 +5304,9 @@
       }
     },
     "setprototypeof": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
     "shelljs": {
       "version": "0.6.1",
@@ -5094,9 +5389,9 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
       "requires": {
         "asn1": "0.2.3",
         "assert-plus": "1.0.0",
@@ -5116,9 +5411,9 @@
       }
     },
     "statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
     "stream-counter": {
       "version": "0.2.0",
@@ -5145,9 +5440,9 @@
       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="
     },
     "strip-ansi": {
       "version": "3.0.1",
@@ -5243,24 +5538,27 @@
       }
     },
     "tar-fs": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz",
-      "integrity": "sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz",
+      "integrity": "sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ==",
       "requires": {
         "chownr": "1.0.1",
         "mkdirp": "0.5.1",
         "pump": "1.0.3",
-        "tar-stream": "1.5.5"
+        "tar-stream": "1.6.1"
       }
     },
     "tar-stream": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
-      "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz",
+      "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==",
       "requires": {
-        "bl": "1.2.1",
+        "bl": "1.2.2",
+        "buffer-alloc": "1.2.0",
         "end-of-stream": "1.4.1",
-        "readable-stream": "2.3.4",
+        "fs-constants": "1.0.0",
+        "readable-stream": "2.3.6",
+        "to-buffer": "1.1.1",
         "xtend": "4.0.1"
       },
       "dependencies": {
@@ -5270,25 +5568,25 @@
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "safe-buffer": "5.1.2",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         }
       }
@@ -5332,17 +5630,22 @@
       "integrity": "sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY="
     },
     "to-boolean-x": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.1.tgz",
-      "integrity": "sha512-PstxY3K6hVEHnY3FITs8XBoJbt0RI1e4MLIhAL9hWa3BtVLCrb86vU5z6lEKh7uZZjiPiLqIKMmfMro1nNgtXQ=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-boolean-x/-/to-boolean-x-1.0.3.tgz",
+      "integrity": "sha512-kQiMyJUgFprL8J+0CfgJuaSFKJMs3EvFe27/6aj/hVzVZT0HY4aA1QjPldLNxzBmjhLcapp7CctYHuD8QqtS3g=="
+    },
+    "to-buffer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
+      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
     },
     "to-integer-x": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/to-integer-x/-/to-integer-x-3.0.0.tgz",
       "integrity": "sha512-794L2Lpwjtynm7RxahJi2YdbRY75gTxUW27TMuN26UgwPkmJb/+HPhkFEFbz+E4vNoiP0dxq5tq5fkXoXLaK/w==",
       "requires": {
-        "is-finite-x": "3.0.2",
-        "is-nan-x": "1.0.1",
+        "is-finite-x": "3.0.4",
+        "is-nan-x": "1.0.3",
         "math-sign-x": "3.0.0",
         "to-number-x": "2.0.0"
       }
@@ -5352,8 +5655,8 @@
       "resolved": "https://registry.npmjs.org/to-number-x/-/to-number-x-2.0.0.tgz",
       "integrity": "sha512-lGOnCoccUoSzjZ/9Uen8TC4+VFaQcFGhTroWTv2tYWxXgyJV1zqAZ8hEIMkez/Eo790fBMOjidTnQ/OJSCvAoQ==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "nan-x": "1.0.0",
+        "cached-constructors-x": "1.0.2",
+        "nan-x": "1.0.2",
         "parse-int-x": "2.0.0",
         "to-primitive-x": "1.1.0",
         "trim-x": "3.0.0"
@@ -5364,8 +5667,8 @@
       "resolved": "https://registry.npmjs.org/to-object-x/-/to-object-x-1.5.0.tgz",
       "integrity": "sha512-AKn5GQcdWky+s20vjWkt+Wa6y3dxQH3yQyMBhOfBOPldUwqwhgvlqcIg5H092ntNc+TX8/Cxzs1kMHH19pyCnA==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-object-coercible-x": "1.4.1"
+        "cached-constructors-x": "1.0.2",
+        "require-object-coercible-x": "1.4.3"
       }
     },
     "to-primitive-x": {
@@ -5373,14 +5676,21 @@
       "resolved": "https://registry.npmjs.org/to-primitive-x/-/to-primitive-x-1.1.0.tgz",
       "integrity": "sha512-gyMY0gi3wjK3e4MUBKqv9Zl8QGcWguIkaUr2VJmoBEsOpDcpDZSEyljR773eVG4maS48uX7muLkoQoh/BA82OQ==",
       "requires": {
-        "has-symbol-support-x": "1.4.1",
+        "has-symbol-support-x": "1.4.2",
         "is-date-object": "1.0.1",
         "is-function-x": "3.3.0",
-        "is-nil-x": "1.4.1",
+        "is-nil-x": "1.4.2",
         "is-primitive": "2.0.0",
         "is-symbol": "1.0.1",
-        "require-object-coercible-x": "1.4.1",
+        "require-object-coercible-x": "1.4.3",
         "validate.io-undefined": "1.0.3"
+      },
+      "dependencies": {
+        "is-primitive": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+          "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+        }
       }
     },
     "to-property-key-x": {
@@ -5388,42 +5698,43 @@
       "resolved": "https://registry.npmjs.org/to-property-key-x/-/to-property-key-x-2.0.2.tgz",
       "integrity": "sha512-YISLpZFYIazNm0P8hLsKEEUEZ3m8U3+eDysJZqTu3+B9tQp+2TrMpaEGT8Agh4fZ5LSoums60/glNEzk5ozqrg==",
       "requires": {
-        "has-symbol-support-x": "1.4.1",
+        "has-symbol-support-x": "1.4.2",
         "to-primitive-x": "1.1.0",
-        "to-string-x": "1.4.2"
+        "to-string-x": "1.4.5"
       }
     },
     "to-string-symbols-supported-x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.0.tgz",
-      "integrity": "sha512-HbVH673pybrUmhzESGHUm17BBJvqb7BU8HciOvuEYm9ipuDyjmddhvkVqpVW6sM/C5/zhJo17n7O7I/24loJIQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/to-string-symbols-supported-x/-/to-string-symbols-supported-x-1.0.2.tgz",
+      "integrity": "sha512-3MRqhIhSNVDsVAk4M6WNcuBZrAQe54W13xrXX6RzxXS+pA4nj6DQ96RegQS5z9BSNyYbFsBsPvMVDIpP+a/5RA==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "has-symbol-support-x": "1.4.1",
+        "cached-constructors-x": "1.0.2",
+        "has-symbol-support-x": "1.4.2",
         "is-symbol": "1.0.1"
       }
     },
     "to-string-tag-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.2.tgz",
-      "integrity": "sha512-ytO9eLigxsQQLGuab0C1iSSTzKdJNVSlBg0Spg4J/rGAVrQJ5y774mo0SSzgGeTT4RJGGyJNfObXaTMzX0XDOQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/to-string-tag-x/-/to-string-tag-x-1.4.3.tgz",
+      "integrity": "sha512-5+0EZ6dOVt/XArXmkooxPzWxmOR081HM/uXitUow7h11WYg5pPo15uYqDWuqO7ZY+O3Atn/dG26wcJCK+mFevg==",
       "requires": {
         "lodash.isnull": "3.0.0",
         "validate.io-undefined": "1.0.3"
       }
     },
     "to-string-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.2.tgz",
-      "integrity": "sha512-/WP5arlwtCpAAexCCHiQBW0eXwse84osWyP1Qtaz71nsYSuUpOkT6tBm8nQ4IIUfSh5hji0hDupUCD2xbbOL6A==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/to-string-x/-/to-string-x-1.4.5.tgz",
+      "integrity": "sha512-5xzlZDyDa9BUWNjNzZzHgKQ95PnV7qjvEhbqpFaj1ixaHgfJXOFaa3xdMJ+WLYd4hhaMJaxt8Pt5uKaWXfruXA==",
       "requires": {
+        "cached-constructors-x": "1.0.2",
         "is-symbol": "1.0.1"
       }
     },
     "tough-cookie": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
       "requires": {
         "punycode": "1.4.1"
       }
@@ -5433,9 +5744,9 @@
       "resolved": "https://registry.npmjs.org/trim-left-x/-/trim-left-x-3.0.0.tgz",
       "integrity": "sha512-+m6cqkppI+CxQBTwWEZliOHpOBnCArGyMnS1WCLb6IRgukhTkiQu/TNEN5Lj2eM9jk8ewJsc7WxFZfmwNpRXWQ==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
+        "cached-constructors-x": "1.0.2",
+        "require-coercible-to-string-x": "1.0.2",
+        "white-space-x": "3.0.1"
       }
     },
     "trim-newlines": {
@@ -5449,9 +5760,9 @@
       "resolved": "https://registry.npmjs.org/trim-right-x/-/trim-right-x-3.0.0.tgz",
       "integrity": "sha512-iIqEsWEbWVodqdixJHi4FoayJkUxhoL4AvSNGp4FF4FfQKRPGizt8++/RnyC9od75y7P/S6EfONoVqP+NddiKA==",
       "requires": {
-        "cached-constructors-x": "1.0.0",
-        "require-coercible-to-string-x": "1.0.0",
-        "white-space-x": "3.0.0"
+        "cached-constructors-x": "1.0.2",
+        "require-coercible-to-string-x": "1.0.2",
+        "white-space-x": "3.0.1"
       }
     },
     "trim-x": {
@@ -5489,12 +5800,12 @@
       "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI="
     },
     "type-is": {
-      "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.17"
+        "mime-types": "2.1.18"
       }
     },
     "typedarray": {
@@ -5564,32 +5875,6 @@
       "integrity": "sha1-gGmSYzZl1eX8tNsfs6hi62jp5to=",
       "dev": true
     },
-    "universal": {
-      "version": "github:GPII/universal#08b73b801826be40f5516358b463d10d71260e9d",
-      "requires": {
-        "body-parser": "1.17.2",
-        "connect-ensure-login": "0.1.1",
-        "express": "4.15.4",
-        "fluid-resolve": "1.3.0",
-        "glob": "7.1.2",
-        "gpii-pouchdb": "1.0.7",
-        "infusion": "3.0.0-dev.20170830T182157Z.392b2f8",
-        "ini": "git://github.com/GPII/ini.git#be8a04aa22f5ad9321ebcbba7740314a53bc8ab2",
-        "json5": "0.5.1",
-        "kettle": "1.7.0",
-        "mkdirp": "0.5.1",
-        "nock": "9.1.0",
-        "node-jqunit": "1.1.7",
-        "node-uuid": "1.4.8",
-        "oauth2orize": "1.8.0",
-        "passport": "0.3.2",
-        "passport-oauth2-client-password": "0.1.2",
-        "rimraf": "2.6.1",
-        "semver": "5.4.1",
-        "write-file-atomic": "2.3.0",
-        "xml-mapping": "1.7.1"
-      }
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -5718,9 +6003,9 @@
       }
     },
     "white-space-x": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.0.tgz",
-      "integrity": "sha512-nMPVXGMdi/jQepXKryxqzEh/vCwdOYY/u6NZy40glMHvZfEr7/+vQKnDhEq4rZ1nniOFq9GWohQYB30uW/5Olg=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/white-space-x/-/white-space-x-3.0.1.tgz",
+      "integrity": "sha512-BwMFXQNPna/4RsNPOgldVYn+FkEv+lc3wUiFzuaW6Z2DH/oSk1UrRD6SBqDgWQO4JU+aBq3PVuPD9Vz0j7mh0w=="
     },
     "window-size": {
       "version": "0.1.0",
@@ -5774,15 +6059,6 @@
         }
       }
     },
-    "ws": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.1.0.tgz",
-      "integrity": "sha512-TU4/qKFlyQFqNITNWiqPCUY9GqlAhEotlzfcZcve6VT1YEngQl1dDMqwQQS3eMYruJ5r/UD3lcsWib6iVMDGDw==",
-      "requires": {
-        "safe-buffer": "5.1.1",
-        "ultron": "1.1.1"
-      }
-    },
     "xml-mapping": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/xml-mapping/-/xml-mapping-1.7.1.tgz",
@@ -5803,9 +6079,9 @@
       "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
     },
     "xmlhttprequest-cookie": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-cookie/-/xmlhttprequest-cookie-0.9.5.tgz",
-      "integrity": "sha512-22025VdbqwVoDs8szSGRcDAQxEoTMBbBTCd1H4wg/7zyFXz29EVzXUyLmx6tGuiX9SYK3pBBT5rLLn1hyLNX0Q==",
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-cookie/-/xmlhttprequest-cookie-0.9.6.tgz",
+      "integrity": "sha512-HjGd9DEXQtuvsKFIVXuVdo7MJO7cAL2LdimzThxyLcIfkp6waMoZl22nbnuI2/GkXCTtF0W1xzBli8G+yEyi1g==",
       "requires": {
         "xmlhttprequest": "1.8.0"
       }
diff --git a/package.json b/package.json
index beb126c..b840387 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "bugs": "http://issues.gpii.net/browse/GPII",
   "homepage": "http://gpii.net/",
   "dependencies": {
-    "universal": "GPII/universal#08b73b801826be40f5516358b463d10d71260e9d"
+    "gpii-universal": "0.3.0-dev.20180221T093422Z.50833c1"
   },
   "devDependencies": {
     "fluid-grunt-eslint": "18.1.1",
diff --git a/tests/AcceptanceTests.js b/tests/AcceptanceTests.js
index d1ca5f8..19baac2 100644
--- a/tests/AcceptanceTests.js
+++ b/tests/AcceptanceTests.js
@@ -16,7 +16,7 @@ Seventh Framework Programme (FP7/2007-2013) under grant agreement no. 289016.
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii");
 
 gpii.loadTestingSupport();
@@ -25,7 +25,7 @@ fluid.registerNamespace("gpii.acceptanceTesting.linux");
 
 require("../index.js");
 
-var baseDir = fluid.module.resolvePath("%universal/tests/");
-var linuxFiles = fluid.require("%universal/tests/platform/index-linux.js");
+var baseDir = fluid.module.resolvePath("%gpii-universal/tests/");
+var linuxFiles = fluid.require("%gpii-universal/tests/platform/index-linux.js");
 
 gpii.test.runSuitesWithFiltering(linuxFiles, baseDir, ["gpii.test.acceptance.testCaseHolder"]);