diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index f1fd5517..162d40e9 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -67,6 +67,7 @@
     "log4js": {
       "version": "0.6.21",
       "from": "log4js@~0.6.17",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.21.tgz",
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -91,7 +92,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2"
             }
           }
         }
@@ -137,7 +138,8 @@
     },
     "request": {
       "version": "2.9.203",
-      "from": "request@~2.9.203"
+      "from": "request@~2.9.203",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
     },
     "rollbar": {
       "version": "0.3.13",
@@ -167,9 +169,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.30.0",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.30.0",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.30.0",
+      "version": "0.31.0",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.31.0",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.31.0",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -188,7 +190,8 @@
               "dependencies": {
                 "underscore": {
                   "version": "1.4.4",
-                  "from": "underscore@~1.4.3"
+                  "from": "underscore@~1.4.3",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
                 },
                 "mapnik-reference": {
                   "version": "5.0.9",
@@ -311,7 +314,8 @@
                       "dependencies": {
                         "hoek": {
                           "version": "0.9.1",
-                          "from": "hoek@0.9.x"
+                          "from": "hoek@0.9.x",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                         },
                         "boom": {
                           "version": "0.4.2",
@@ -1470,6 +1474,7 @@
             "connect": {
               "version": "1.9.2",
               "from": "connect@1.x",
+              "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz",
               "dependencies": {
                 "formidable": {
                   "version": "1.0.15",
@@ -1480,11 +1485,13 @@
             },
             "mime": {
               "version": "1.2.4",
-              "from": "mime@1.2.4"
+              "from": "mime@1.2.4",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"
             },
             "qs": {
               "version": "0.4.2",
-              "from": "qs@0.4.x"
+              "from": "qs@0.4.x",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"
             },
             "mkdirp": {
               "version": "0.3.0",
@@ -1895,29 +1902,26 @@
             },
             "sphericalmercator": {
               "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.1"
+              "from": "sphericalmercator@~1.0.2"
             }
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.11",
-          "from": "tilelive-mapnik@0.6.11",
+          "version": "0.6.12",
+          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
+          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
           "dependencies": {
-            "underscore": {
-              "version": "1.3.3",
-              "from": "underscore@~1.3.3"
-            },
             "generic-pool": {
-              "version": "2.0.4",
-              "from": "generic-pool@~2.0.0"
+              "version": "2.1.1",
+              "from": "generic-pool@~2.1.1"
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@~1.2.9"
+              "from": "mime@~1.2.11"
             },
             "sphericalmercator": {
               "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.1"
+              "from": "sphericalmercator@~1.0.2"
             }
           }
         },
@@ -1957,7 +1961,8 @@
           "dependencies": {
             "underscore": {
               "version": "1.4.4",
-              "from": "underscore@~1.4.3"
+              "from": "underscore@~1.4.3",
+              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
             },
             "mapnik-reference": {
               "version": "5.0.9",