diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c020ce4e..f8eaf683 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -58,7 +58,7 @@
         },
         "qs": {
           "version": "5.1.0",
-          "from": "qs@5.1.0",
+          "from": "qs@~5.1.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
         },
         "raw-body": {
@@ -68,14 +68,14 @@
           "dependencies": {
             "unpipe": {
               "version": "1.0.0",
-              "from": "unpipe@1.0.0",
+              "from": "unpipe@~1.0.0",
               "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
             }
           }
         },
         "type-is": {
           "version": "1.6.9",
-          "from": "type-is@~1.6.9",
+          "from": "type-is@~1.6.6",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz",
           "dependencies": {
             "media-typer": {
@@ -359,7 +359,7 @@
             },
             "statuses": {
               "version": "1.2.1",
-              "from": "statuses@~1.2.1",
+              "from": "statuses@1",
               "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
             }
           }
@@ -425,9 +425,9 @@
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
           "dependencies": {
             "core-util-is": {
-              "version": "1.0.1",
+              "version": "1.0.2",
               "from": "core-util-is@~1.0.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
             },
             "isarray": {
               "version": "0.0.1",
@@ -527,9 +527,9 @@
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz",
               "dependencies": {
                 "core-util-is": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "core-util-is@~1.0.0",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
@@ -594,7 +594,7 @@
         },
         "mime-types": {
           "version": "2.1.7",
-          "from": "mime-types@~2.1.6",
+          "from": "mime-types@~2.1.7",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz",
           "dependencies": {
             "mime-db": {
@@ -652,9 +652,9 @@
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
         },
         "hawk": {
-          "version": "3.1.1",
+          "version": "3.1.2",
           "from": "hawk@~3.1.0",
-          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz",
           "dependencies": {
             "hoek": {
               "version": "2.16.3",
@@ -663,7 +663,7 @@
             },
             "boom": {
               "version": "2.10.1",
-              "from": "boom@^2.8.x",
+              "from": "boom@2.x.x",
               "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
             },
             "cryptiles": {
@@ -827,14 +827,14 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.5.1",
+      "version": "1.6.1",
       "from": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
       "resolved": "https://github.com/CartoDB/Windshaft/tarball/mapconfig-extension",
       "dependencies": {
         "mapnik": {
-          "version": "1.4.15-cdb5",
-          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
-          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb5",
+          "version": "1.4.15-cdb6",
+          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb6",
+          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb6",
           "dependencies": {
             "nan": {
               "version": "1.2.0",
@@ -2995,9 +2995,9 @@
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.15-cdb3",
-          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
-          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb3",
+          "version": "0.6.15-cdb5",
+          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb5",
+          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb5",
           "dependencies": {
             "generic-pool": {
               "version": "2.1.1",
@@ -3012,14 +3012,14 @@
           }
         },
         "tilelive-bridge": {
-          "version": "1.3.0-cdb3",
-          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
-          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb3",
+          "version": "1.3.0-cdb4",
+          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb4",
+          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb4",
           "dependencies": {
             "mapnik-pool": {
-              "version": "0.1.1-cdb3",
-              "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
-              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb3",
+              "version": "0.1.1-cdb4",
+              "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb4",
+              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb4",
               "dependencies": {
                 "generic-pool": {
                   "version": "2.1.1",
@@ -3109,9 +3109,9 @@
           "from": "torque.js@~2.11.0"
         },
         "abaculus": {
-          "version": "1.1.0-cdb3",
-          "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3",
-          "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb3"
+          "version": "1.1.0-cdb4",
+          "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb4",
+          "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb4"
         },
         "sphericalmercator": {
           "version": "1.0.3",