diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3eb3b57d..4c78f2a3 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -122,9 +122,9 @@
       "from": "fastly-purge@~1.0.0",
       "dependencies": {
         "request": {
-          "version": "2.61.0",
+          "version": "2.62.0",
           "from": "request@^2.55.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.61.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.62.0.tgz",
           "dependencies": {
             "bl": {
               "version": "1.0.0",
@@ -143,7 +143,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
+                      "from": "inherits@2",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "isarray": {
@@ -220,9 +220,9 @@
               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
             },
             "qs": {
-              "version": "4.0.0",
-              "from": "qs@~4.0.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"
+              "version": "5.1.0",
+              "from": "qs@~5.1.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
             },
             "tunnel-agent": {
               "version": "0.4.1",
@@ -267,9 +267,9 @@
               "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.0.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "2.15.0",
+                  "version": "2.16.0",
                   "from": "hoek@2.x.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.15.0.tgz"
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.0.tgz"
                 },
                 "boom": {
                   "version": "2.8.0",
@@ -550,11 +550,6 @@
       "from": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations-mvt",
       "resolved": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations-mvt",
       "dependencies": {
-        "chronograph": {
-          "version": "0.1.0",
-          "from": "chronograph@git://github.com/CartoDB/chronographjs.git#0.1.0",
-          "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
-        },
         "grainstore": {
           "version": "1.0.0",
           "from": "grainstore@~1.0.0",
@@ -2352,394 +2347,9 @@
         },
         "tilelive-bridge": {
           "version": "1.3.0",
-          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/cdb",
-          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/cdb",
+          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
+          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option",
           "dependencies": {
-            "mapnik": {
-              "version": "1.4.15-cdb1",
-              "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
-              "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
-              "dependencies": {
-                "nan": {
-                  "version": "1.2.0",
-                  "from": "nan@~1.2.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.2.0.tgz"
-                },
-                "mapnik-vector-tile": {
-                  "version": "0.5.5",
-                  "from": "mapnik-vector-tile@0.5.5",
-                  "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz"
-                },
-                "node-pre-gyp": {
-                  "version": "0.5.25",
-                  "from": "node-pre-gyp@0.5.25",
-                  "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz",
-                  "dependencies": {
-                    "nopt": {
-                      "version": "3.0.1",
-                      "from": "nopt@~3.0.1",
-                      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
-                      "dependencies": {
-                        "abbrev": {
-                          "version": "1.0.5",
-                          "from": "abbrev@1",
-                          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
-                        }
-                      }
-                    },
-                    "npmlog": {
-                      "version": "0.1.1",
-                      "from": "npmlog@~0.1.1",
-                      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
-                      "dependencies": {
-                        "ansi": {
-                          "version": "0.3.0",
-                          "from": "ansi@~0.3.0",
-                          "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
-                        }
-                      }
-                    },
-                    "request": {
-                      "version": "2.40.0",
-                      "from": "request@2.x",
-                      "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
-                      "dependencies": {
-                        "qs": {
-                          "version": "1.0.2",
-                          "from": "qs@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz"
-                        },
-                        "json-stringify-safe": {
-                          "version": "5.0.0",
-                          "from": "json-stringify-safe@~5.0.0",
-                          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                        },
-                        "mime-types": {
-                          "version": "1.0.2",
-                          "from": "mime-types@~1.0.1",
-                          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
-                        },
-                        "forever-agent": {
-                          "version": "0.5.2",
-                          "from": "forever-agent@~0.5.0",
-                          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                        },
-                        "node-uuid": {
-                          "version": "1.4.1",
-                          "from": "node-uuid@~1.4.0",
-                          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-                        },
-                        "tough-cookie": {
-                          "version": "0.12.1",
-                          "from": "tough-cookie@>=0.12.0",
-                          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-                          "dependencies": {
-                            "punycode": {
-                              "version": "1.3.1",
-                              "from": "punycode@>=0.2.0",
-                              "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
-                            }
-                          }
-                        },
-                        "form-data": {
-                          "version": "0.1.4",
-                          "from": "form-data@~0.1.0",
-                          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-                          "dependencies": {
-                            "combined-stream": {
-                              "version": "0.0.5",
-                              "from": "combined-stream@~0.0.4",
-                              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
-                              "dependencies": {
-                                "delayed-stream": {
-                                  "version": "0.0.5",
-                                  "from": "delayed-stream@0.0.5",
-                                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                                }
-                              }
-                            },
-                            "mime": {
-                              "version": "1.2.11",
-                              "from": "mime@~1.2.11",
-                              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                            },
-                            "async": {
-                              "version": "0.9.0",
-                              "from": "async@~0.9.0",
-                              "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
-                            }
-                          }
-                        },
-                        "tunnel-agent": {
-                          "version": "0.4.0",
-                          "from": "tunnel-agent@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-                        },
-                        "http-signature": {
-                          "version": "0.10.0",
-                          "from": "http-signature@~0.10.0",
-                          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
-                          "dependencies": {
-                            "assert-plus": {
-                              "version": "0.1.2",
-                              "from": "assert-plus@0.1.2",
-                              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
-                            },
-                            "asn1": {
-                              "version": "0.1.11",
-                              "from": "asn1@0.1.11",
-                              "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                            },
-                            "ctype": {
-                              "version": "0.5.2",
-                              "from": "ctype@0.5.2",
-                              "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
-                            }
-                          }
-                        },
-                        "oauth-sign": {
-                          "version": "0.3.0",
-                          "from": "oauth-sign@~0.3.0",
-                          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
-                        },
-                        "hawk": {
-                          "version": "1.1.1",
-                          "from": "hawk@1.1.1",
-                          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
-                          "dependencies": {
-                            "hoek": {
-                              "version": "0.9.1",
-                              "from": "hoek@0.9.x",
-                              "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                            },
-                            "boom": {
-                              "version": "0.4.2",
-                              "from": "boom@0.4.x",
-                              "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                            },
-                            "cryptiles": {
-                              "version": "0.2.2",
-                              "from": "cryptiles@0.2.x",
-                              "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                            },
-                            "sntp": {
-                              "version": "0.2.4",
-                              "from": "sntp@0.2.x",
-                              "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                            }
-                          }
-                        },
-                        "aws-sign2": {
-                          "version": "0.5.0",
-                          "from": "aws-sign2@~0.5.0",
-                          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                        },
-                        "stringstream": {
-                          "version": "0.0.4",
-                          "from": "stringstream@~0.0.4",
-                          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
-                        }
-                      }
-                    },
-                    "semver": {
-                      "version": "3.0.1",
-                      "from": "semver@~3.0.1",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
-                    },
-                    "tar": {
-                      "version": "1.0.1",
-                      "from": "tar@~1.0.0",
-                      "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz",
-                      "dependencies": {
-                        "block-stream": {
-                          "version": "0.0.7",
-                          "from": "block-stream@*",
-                          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
-                        },
-                        "fstream": {
-                          "version": "1.0.2",
-                          "from": "fstream@^1.0.2",
-                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "3.0.2",
-                              "from": "graceful-fs@3",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
-                            }
-                          }
-                        },
-                        "inherits": {
-                          "version": "2.0.1",
-                          "from": "inherits@2",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                        }
-                      }
-                    },
-                    "tar-pack": {
-                      "version": "2.0.0",
-                      "from": "tar-pack@~2.0.0",
-                      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
-                      "dependencies": {
-                        "uid-number": {
-                          "version": "0.0.3",
-                          "from": "uid-number@0.0.3",
-                          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
-                        },
-                        "once": {
-                          "version": "1.1.1",
-                          "from": "once@~1.1.1",
-                          "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
-                        },
-                        "debug": {
-                          "version": "0.7.4",
-                          "from": "debug@~0.7.2",
-                          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-                        },
-                        "fstream": {
-                          "version": "0.1.31",
-                          "from": "fstream@~0.1.22",
-                          "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
-                          "dependencies": {
-                            "graceful-fs": {
-                              "version": "3.0.2",
-                              "from": "graceful-fs@~3.0.2",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        },
-                        "tar": {
-                          "version": "0.1.20",
-                          "from": "tar@~0.1.17",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
-                          "dependencies": {
-                            "block-stream": {
-                              "version": "0.0.7",
-                              "from": "block-stream@*",
-                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        },
-                        "fstream-ignore": {
-                          "version": "0.0.7",
-                          "from": "fstream-ignore@0.0.7",
-                          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
-                          "dependencies": {
-                            "minimatch": {
-                              "version": "0.2.14",
-                              "from": "minimatch@~0.2.0",
-                              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                              "dependencies": {
-                                "lru-cache": {
-                                  "version": "2.5.0",
-                                  "from": "lru-cache@2",
-                                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                                },
-                                "sigmund": {
-                                  "version": "1.0.0",
-                                  "from": "sigmund@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
-                                }
-                              }
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        },
-                        "readable-stream": {
-                          "version": "1.0.31",
-                          "from": "readable-stream@~1.0.2",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-                          "dependencies": {
-                            "core-util-is": {
-                              "version": "1.0.1",
-                              "from": "core-util-is@~1.0.0",
-                              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                            },
-                            "isarray": {
-                              "version": "0.0.1",
-                              "from": "isarray@0.0.1",
-                              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                            },
-                            "string_decoder": {
-                              "version": "0.10.31",
-                              "from": "string_decoder@~0.10.x",
-                              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                            },
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@~2.0.1",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            }
-                          }
-                        },
-                        "graceful-fs": {
-                          "version": "1.2.3",
-                          "from": "graceful-fs@1.2",
-                          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                        }
-                      }
-                    },
-                    "mkdirp": {
-                      "version": "0.5.0",
-                      "from": "mkdirp@~0.5.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.8",
-                          "from": "minimist@0.0.8",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                        }
-                      }
-                    },
-                    "rc": {
-                      "version": "0.5.1",
-                      "from": "rc@~0.5.0",
-                      "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.1.tgz",
-                      "dependencies": {
-                        "minimist": {
-                          "version": "0.0.10",
-                          "from": "minimist@~0.0.7",
-                          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                        },
-                        "deep-extend": {
-                          "version": "0.2.11",
-                          "from": "deep-extend@~0.2.5",
-                          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
-                        },
-                        "strip-json-comments": {
-                          "version": "0.1.3",
-                          "from": "strip-json-comments@0.1.x",
-                          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                        },
-                        "ini": {
-                          "version": "1.1.0",
-                          "from": "ini@~1.1.0",
-                          "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                        }
-                      }
-                    },
-                    "rimraf": {
-                      "version": "2.2.8",
-                      "from": "rimraf@~2.2.8",
-                      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                    }
-                  }
-                }
-              }
-            },
             "mapnik-pool": {
               "version": "0.1.1",
               "from": "mapnik-pool@0.1.x",
@@ -3185,6 +2795,29 @@
             }
           }
         },
+        "cartodb-psql": {
+          "version": "0.6.1",
+          "from": "cartodb-psql@~0.6.1",
+          "dependencies": {
+            "pg": {
+              "version": "2.6.2-cdb3",
+              "from": "pg@git://github.com/CartoDB/node-postgres.git#2.6.2-cdb3",
+              "resolved": "git://github.com/CartoDB/node-postgres.git#069c5296d1a093077feff21719641bb9e71fc50e",
+              "dependencies": {
+                "generic-pool": {
+                  "version": "2.0.3",
+                  "from": "generic-pool@2.0.3",
+                  "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.0.3.tgz"
+                },
+                "buffer-writer": {
+                  "version": "1.0.0",
+                  "from": "buffer-writer@1.0.0",
+                  "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.0.tgz"
+                }
+              }
+            }
+          }
+        },
         "torque.js": {
           "version": "2.11.0",
           "from": "torque.js@~2.11.0",