diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4fbd8930..4ffe11af 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.87.6",
+  "version": "2.88.2",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -609,7 +609,7 @@
         },
         "type-is": {
           "version": "1.6.14",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz",
           "dependencies": {
             "media-typer": {
@@ -1167,9 +1167,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "2.6.6",
+      "version": "2.7.1",
       "from": "cartodb/windshaft#mapnik-migration",
-      "resolved": "git://github.com/cartodb/windshaft.git#8513b9e7b27f5bf39ffa00cd9e1038f7722b396a",
+      "resolved": "git://github.com/cartodb/windshaft.git#4ff259e66e192ad0ce7a4a7cb7a6a2463f381990",
       "dependencies": {
         "abaculus": {
           "version": "2.0.3-cdb1",
@@ -1678,9 +1678,9 @@
                                       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
                                     },
                                     "readable-stream": {
-                                      "version": "2.2.2",
+                                      "version": "2.2.3",
                                       "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-                                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
+                                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz",
                                       "dependencies": {
                                         "buffer-shims": {
                                           "version": "1.0.0",
@@ -2206,7 +2206,7 @@
                                     },
                                     "minimatch": {
                                       "version": "3.0.3",
-                                      "from": "minimatch@>=3.0.0 <4.0.0",
+                                      "from": "minimatch@>=3.0.2 <4.0.0",
                                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
                                       "dependencies": {
                                         "brace-expansion": {
@@ -2266,7 +2266,7 @@
                                 },
                                 "fstream": {
                                   "version": "1.0.10",
-                                  "from": "fstream@>=1.0.10 <1.1.0",
+                                  "from": "fstream@>=1.0.2 <2.0.0",
                                   "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
                                   "dependencies": {
                                     "graceful-fs": {
@@ -2420,6 +2420,806 @@
                     }
                   }
                 },
+                "zipfile": {
+                  "version": "0.5.11",
+                  "from": "zipfile@>=0.5.5 <0.6.0",
+                  "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.11.tgz",
+                  "dependencies": {
+                    "nan": {
+                      "version": "2.4.0",
+                      "from": "nan@>=2.4.0 <2.5.0",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
+                    },
+                    "node-pre-gyp": {
+                      "version": "0.6.32",
+                      "from": "node-pre-gyp@>=0.6.30 <0.7.0",
+                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz",
+                      "dependencies": {
+                        "mkdirp": {
+                          "version": "0.5.1",
+                          "from": "mkdirp@>=0.5.1 <0.6.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.8",
+                              "from": "minimist@0.0.8",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                            }
+                          }
+                        },
+                        "nopt": {
+                          "version": "3.0.6",
+                          "from": "nopt@>=3.0.6 <3.1.0",
+                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                          "dependencies": {
+                            "abbrev": {
+                              "version": "1.0.9",
+                              "from": "abbrev@>=1.0.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
+                            }
+                          }
+                        },
+                        "npmlog": {
+                          "version": "4.0.2",
+                          "from": "npmlog@>=4.0.1 <5.0.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
+                          "dependencies": {
+                            "are-we-there-yet": {
+                              "version": "1.1.2",
+                              "from": "are-we-there-yet@>=1.1.2 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz",
+                              "dependencies": {
+                                "delegates": {
+                                  "version": "1.0.0",
+                                  "from": "delegates@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+                                },
+                                "readable-stream": {
+                                  "version": "2.2.2",
+                                  "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
+                                  "dependencies": {
+                                    "buffer-shims": {
+                                      "version": "1.0.0",
+                                      "from": "buffer-shims@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+                                    },
+                                    "core-util-is": {
+                                      "version": "1.0.2",
+                                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "1.0.0",
+                                      "from": "isarray@>=1.0.0 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.3",
+                                      "from": "inherits@>=2.0.1 <2.1.0",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                                    },
+                                    "process-nextick-args": {
+                                      "version": "1.0.7",
+                                      "from": "process-nextick-args@>=1.0.6 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "util-deprecate": {
+                                      "version": "1.0.2",
+                                      "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "console-control-strings": {
+                              "version": "1.1.0",
+                              "from": "console-control-strings@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+                            },
+                            "gauge": {
+                              "version": "2.7.2",
+                              "from": "gauge@>=2.7.1 <2.8.0",
+                              "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz",
+                              "dependencies": {
+                                "aproba": {
+                                  "version": "1.0.4",
+                                  "from": "aproba@>=1.0.3 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"
+                                },
+                                "supports-color": {
+                                  "version": "0.2.0",
+                                  "from": "supports-color@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
+                                },
+                                "has-unicode": {
+                                  "version": "2.0.1",
+                                  "from": "has-unicode@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
+                                },
+                                "object-assign": {
+                                  "version": "4.1.0",
+                                  "from": "object-assign@>=4.1.0 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
+                                },
+                                "signal-exit": {
+                                  "version": "3.0.2",
+                                  "from": "signal-exit@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
+                                },
+                                "string-width": {
+                                  "version": "1.0.2",
+                                  "from": "string-width@>=1.0.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                                  "dependencies": {
+                                    "code-point-at": {
+                                      "version": "1.1.0",
+                                      "from": "code-point-at@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
+                                    },
+                                    "is-fullwidth-code-point": {
+                                      "version": "1.0.0",
+                                      "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+                                      "dependencies": {
+                                        "number-is-nan": {
+                                          "version": "1.0.1",
+                                          "from": "number-is-nan@>=1.0.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "strip-ansi": {
+                                  "version": "3.0.1",
+                                  "from": "strip-ansi@>=3.0.1 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                                  "dependencies": {
+                                    "ansi-regex": {
+                                      "version": "2.0.0",
+                                      "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "wide-align": {
+                                  "version": "1.1.0",
+                                  "from": "wide-align@>=1.1.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"
+                                }
+                              }
+                            },
+                            "set-blocking": {
+                              "version": "2.0.0",
+                              "from": "set-blocking@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "1.1.6",
+                          "from": "rc@>=1.1.6 <1.2.0",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
+                          "dependencies": {
+                            "deep-extend": {
+                              "version": "0.4.1",
+                              "from": "deep-extend@>=0.4.0 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+                            },
+                            "ini": {
+                              "version": "1.3.4",
+                              "from": "ini@>=1.3.0 <1.4.0",
+                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+                            },
+                            "minimist": {
+                              "version": "1.2.0",
+                              "from": "minimist@>=1.2.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+                            },
+                            "strip-json-comments": {
+                              "version": "1.0.4",
+                              "from": "strip-json-comments@>=1.0.4 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
+                            }
+                          }
+                        },
+                        "request": {
+                          "version": "2.79.0",
+                          "from": "request@>=2.79.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
+                          "dependencies": {
+                            "aws-sign2": {
+                              "version": "0.6.0",
+                              "from": "aws-sign2@>=0.6.0 <0.7.0",
+                              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+                            },
+                            "aws4": {
+                              "version": "1.5.0",
+                              "from": "aws4@>=1.2.1 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"
+                            },
+                            "caseless": {
+                              "version": "0.11.0",
+                              "from": "caseless@>=0.11.0 <0.12.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                            },
+                            "combined-stream": {
+                              "version": "1.0.5",
+                              "from": "combined-stream@>=1.0.5 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+                              "dependencies": {
+                                "delayed-stream": {
+                                  "version": "1.0.0",
+                                  "from": "delayed-stream@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                                }
+                              }
+                            },
+                            "extend": {
+                              "version": "3.0.0",
+                              "from": "extend@>=3.0.0 <3.1.0",
+                              "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                            },
+                            "forever-agent": {
+                              "version": "0.6.1",
+                              "from": "forever-agent@>=0.6.1 <0.7.0",
+                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+                            },
+                            "form-data": {
+                              "version": "2.1.2",
+                              "from": "form-data@>=2.1.1 <2.2.0",
+                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
+                              "dependencies": {
+                                "asynckit": {
+                                  "version": "0.4.0",
+                                  "from": "asynckit@>=0.4.0 <0.5.0",
+                                  "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+                                }
+                              }
+                            },
+                            "har-validator": {
+                              "version": "2.0.6",
+                              "from": "har-validator@>=2.0.6 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+                              "dependencies": {
+                                "chalk": {
+                                  "version": "1.1.3",
+                                  "from": "chalk@>=1.1.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+                                  "dependencies": {
+                                    "ansi-styles": {
+                                      "version": "2.2.1",
+                                      "from": "ansi-styles@>=2.2.1 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+                                    },
+                                    "escape-string-regexp": {
+                                      "version": "1.0.5",
+                                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+                                    },
+                                    "has-ansi": {
+                                      "version": "2.0.0",
+                                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                                      "dependencies": {
+                                        "ansi-regex": {
+                                          "version": "2.0.0",
+                                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "strip-ansi": {
+                                      "version": "3.0.1",
+                                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+                                      "dependencies": {
+                                        "ansi-regex": {
+                                          "version": "2.0.0",
+                                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                                        }
+                                      }
+                                    },
+                                    "supports-color": {
+                                      "version": "2.0.0",
+                                      "from": "supports-color@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "commander": {
+                                  "version": "2.9.0",
+                                  "from": "commander@>=2.9.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                                  "dependencies": {
+                                    "graceful-readlink": {
+                                      "version": "1.0.1",
+                                      "from": "graceful-readlink@>=1.0.0",
+                                      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "is-my-json-valid": {
+                                  "version": "2.15.0",
+                                  "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz",
+                                  "dependencies": {
+                                    "generate-function": {
+                                      "version": "2.0.0",
+                                      "from": "generate-function@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                                    },
+                                    "generate-object-property": {
+                                      "version": "1.2.0",
+                                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                                      "dependencies": {
+                                        "is-property": {
+                                          "version": "1.0.2",
+                                          "from": "is-property@>=1.0.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                                        }
+                                      }
+                                    },
+                                    "jsonpointer": {
+                                      "version": "4.0.0",
+                                      "from": "jsonpointer@>=4.0.0 <5.0.0",
+                                      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
+                                    },
+                                    "xtend": {
+                                      "version": "4.0.1",
+                                      "from": "xtend@>=4.0.0 <5.0.0",
+                                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "pinkie-promise": {
+                                  "version": "2.0.1",
+                                  "from": "pinkie-promise@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+                                  "dependencies": {
+                                    "pinkie": {
+                                      "version": "2.0.4",
+                                      "from": "pinkie@>=2.0.0 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "hawk": {
+                              "version": "3.1.3",
+                              "from": "hawk@>=3.1.3 <3.2.0",
+                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+                              "dependencies": {
+                                "hoek": {
+                                  "version": "2.16.3",
+                                  "from": "hoek@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+                                },
+                                "boom": {
+                                  "version": "2.10.1",
+                                  "from": "boom@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+                                },
+                                "cryptiles": {
+                                  "version": "2.0.5",
+                                  "from": "cryptiles@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+                                },
+                                "sntp": {
+                                  "version": "1.0.9",
+                                  "from": "sntp@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+                                }
+                              }
+                            },
+                            "http-signature": {
+                              "version": "1.1.1",
+                              "from": "http-signature@>=1.1.0 <1.2.0",
+                              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+                              "dependencies": {
+                                "assert-plus": {
+                                  "version": "0.2.0",
+                                  "from": "assert-plus@>=0.2.0 <0.3.0",
+                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                                },
+                                "jsprim": {
+                                  "version": "1.3.1",
+                                  "from": "jsprim@>=1.2.2 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz",
+                                  "dependencies": {
+                                    "extsprintf": {
+                                      "version": "1.0.2",
+                                      "from": "extsprintf@1.0.2",
+                                      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+                                    },
+                                    "json-schema": {
+                                      "version": "0.2.3",
+                                      "from": "json-schema@0.2.3",
+                                      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+                                    },
+                                    "verror": {
+                                      "version": "1.3.6",
+                                      "from": "verror@1.3.6",
+                                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                                    }
+                                  }
+                                },
+                                "sshpk": {
+                                  "version": "1.10.1",
+                                  "from": "sshpk@>=1.7.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
+                                  "dependencies": {
+                                    "asn1": {
+                                      "version": "0.2.3",
+                                      "from": "asn1@>=0.2.3 <0.3.0",
+                                      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+                                    },
+                                    "assert-plus": {
+                                      "version": "1.0.0",
+                                      "from": "assert-plus@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                                    },
+                                    "dashdash": {
+                                      "version": "1.14.1",
+                                      "from": "dashdash@>=1.12.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
+                                    },
+                                    "getpass": {
+                                      "version": "0.1.6",
+                                      "from": "getpass@>=0.1.1 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
+                                    },
+                                    "jsbn": {
+                                      "version": "0.1.0",
+                                      "from": "jsbn@>=0.1.0 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+                                    },
+                                    "tweetnacl": {
+                                      "version": "0.14.5",
+                                      "from": "tweetnacl@>=0.14.0 <0.15.0",
+                                      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+                                    },
+                                    "jodid25519": {
+                                      "version": "1.0.2",
+                                      "from": "jodid25519@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+                                    },
+                                    "ecc-jsbn": {
+                                      "version": "0.1.1",
+                                      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+                                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                                    },
+                                    "bcrypt-pbkdf": {
+                                      "version": "1.0.0",
+                                      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "is-typedarray": {
+                              "version": "1.0.0",
+                              "from": "is-typedarray@>=1.0.0 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+                            },
+                            "isstream": {
+                              "version": "0.1.2",
+                              "from": "isstream@>=0.1.2 <0.2.0",
+                              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                            },
+                            "json-stringify-safe": {
+                              "version": "5.0.1",
+                              "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+                            },
+                            "mime-types": {
+                              "version": "2.1.13",
+                              "from": "mime-types@>=2.1.7 <2.2.0",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz",
+                              "dependencies": {
+                                "mime-db": {
+                                  "version": "1.25.0",
+                                  "from": "mime-db@>=1.25.0 <1.26.0",
+                                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"
+                                }
+                              }
+                            },
+                            "oauth-sign": {
+                              "version": "0.8.2",
+                              "from": "oauth-sign@>=0.8.1 <0.9.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
+                            },
+                            "qs": {
+                              "version": "6.3.0",
+                              "from": "qs@>=6.3.0 <6.4.0",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"
+                            },
+                            "stringstream": {
+                              "version": "0.0.5",
+                              "from": "stringstream@>=0.0.4 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+                            },
+                            "tough-cookie": {
+                              "version": "2.3.2",
+                              "from": "tough-cookie@>=2.3.0 <2.4.0",
+                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+                              "dependencies": {
+                                "punycode": {
+                                  "version": "1.4.1",
+                                  "from": "punycode@>=1.4.1 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+                                }
+                              }
+                            },
+                            "tunnel-agent": {
+                              "version": "0.4.3",
+                              "from": "tunnel-agent@>=0.4.1 <0.5.0",
+                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+                            },
+                            "uuid": {
+                              "version": "3.0.1",
+                              "from": "uuid@>=3.0.0 <4.0.0",
+                              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.5.4",
+                          "from": "rimraf@>=2.5.4 <2.6.0",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+                          "dependencies": {
+                            "glob": {
+                              "version": "7.1.1",
+                              "from": "glob@>=7.0.5 <8.0.0",
+                              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+                              "dependencies": {
+                                "fs.realpath": {
+                                  "version": "1.0.0",
+                                  "from": "fs.realpath@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+                                },
+                                "inflight": {
+                                  "version": "1.0.6",
+                                  "from": "inflight@>=1.0.4 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.2",
+                                      "from": "wrappy@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.3",
+                                  "from": "inherits@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                                },
+                                "minimatch": {
+                                  "version": "3.0.3",
+                                  "from": "minimatch@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+                                  "dependencies": {
+                                    "brace-expansion": {
+                                      "version": "1.1.6",
+                                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+                                      "dependencies": {
+                                        "balanced-match": {
+                                          "version": "0.4.2",
+                                          "from": "balanced-match@>=0.4.1 <0.5.0",
+                                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+                                        },
+                                        "concat-map": {
+                                          "version": "0.0.1",
+                                          "from": "concat-map@0.0.1",
+                                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                },
+                                "once": {
+                                  "version": "1.4.0",
+                                  "from": "once@>=1.3.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.2",
+                                      "from": "wrappy@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+                                    }
+                                  }
+                                },
+                                "path-is-absolute": {
+                                  "version": "1.0.1",
+                                  "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "semver": {
+                          "version": "5.3.0",
+                          "from": "semver@>=5.3.0 <5.4.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
+                        },
+                        "tar": {
+                          "version": "2.2.1",
+                          "from": "tar@>=2.2.1 <2.3.0",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+                          "dependencies": {
+                            "block-stream": {
+                              "version": "0.0.9",
+                              "from": "block-stream@*",
+                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+                            },
+                            "fstream": {
+                              "version": "1.0.10",
+                              "from": "fstream@>=1.0.2 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.11",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
+                                }
+                              }
+                            },
+                            "inherits": {
+                              "version": "2.0.3",
+                              "from": "inherits@>=2.0.0 <2.1.0",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                            }
+                          }
+                        },
+                        "tar-pack": {
+                          "version": "3.3.0",
+                          "from": "tar-pack@>=3.3.0 <3.4.0",
+                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz",
+                          "dependencies": {
+                            "debug": {
+                              "version": "2.2.0",
+                              "from": "debug@>=2.2.0 <2.3.0",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                              "dependencies": {
+                                "ms": {
+                                  "version": "0.7.1",
+                                  "from": "ms@0.7.1",
+                                  "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                                }
+                              }
+                            },
+                            "fstream": {
+                              "version": "1.0.10",
+                              "from": "fstream@>=1.0.10 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "4.1.11",
+                                  "from": "graceful-fs@>=4.1.2 <5.0.0",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.3",
+                                  "from": "inherits@>=2.0.0 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                                }
+                              }
+                            },
+                            "fstream-ignore": {
+                              "version": "1.0.5",
+                              "from": "fstream-ignore@>=1.0.5 <1.1.0",
+                              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+                              "dependencies": {
+                                "inherits": {
+                                  "version": "2.0.3",
+                                  "from": "inherits@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                                },
+                                "minimatch": {
+                                  "version": "3.0.3",
+                                  "from": "minimatch@>=3.0.0 <4.0.0",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+                                  "dependencies": {
+                                    "brace-expansion": {
+                                      "version": "1.1.6",
+                                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+                                      "dependencies": {
+                                        "balanced-match": {
+                                          "version": "0.4.2",
+                                          "from": "balanced-match@>=0.4.1 <0.5.0",
+                                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+                                        },
+                                        "concat-map": {
+                                          "version": "0.0.1",
+                                          "from": "concat-map@0.0.1",
+                                          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "once": {
+                              "version": "1.3.3",
+                              "from": "once@>=1.3.3 <1.4.0",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+                              "dependencies": {
+                                "wrappy": {
+                                  "version": "1.0.2",
+                                  "from": "wrappy@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "readable-stream": {
+                              "version": "2.1.5",
+                              "from": "readable-stream@>=2.1.4 <2.2.0",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
+                              "dependencies": {
+                                "buffer-shims": {
+                                  "version": "1.0.0",
+                                  "from": "buffer-shims@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+                                },
+                                "core-util-is": {
+                                  "version": "1.0.2",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.3",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+                                },
+                                "isarray": {
+                                  "version": "1.0.0",
+                                  "from": "isarray@>=1.0.0 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+                                },
+                                "process-nextick-args": {
+                                  "version": "1.0.7",
+                                  "from": "process-nextick-args@>=1.0.6 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "util-deprecate": {
+                                  "version": "1.0.2",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
+                                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+                                }
+                              }
+                            },
+                            "uid-number": {
+                              "version": "0.0.6",
+                              "from": "uid-number@>=0.0.6 <0.1.0",
+                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
                 "sqlite3": {
                   "version": "3.1.8",
                   "from": "sqlite3@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
@@ -3263,9 +4063,9 @@
               }
             },
             "postcss": {
-              "version": "5.2.14",
+              "version": "5.2.15",
               "from": "postcss@>=5.2.8 <5.3.0",
-              "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.14.tgz",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.15.tgz",
               "dependencies": {
                 "chalk": {
                   "version": "1.1.3",
@@ -3409,9 +4209,9 @@
                           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
                         },
                         "readable-stream": {
-                          "version": "2.2.2",
+                          "version": "2.2.3",
                           "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz",
                           "dependencies": {
                             "buffer-shims": {
                               "version": "1.0.0",
@@ -3430,7 +4230,7 @@
                             },
                             "inherits": {
                               "version": "2.0.3",
-                              "from": "inherits@>=2.0.0 <2.1.0",
+                              "from": "inherits@>=2.0.1 <2.1.0",
                               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
                             },
                             "process-nextick-args": {
@@ -3997,7 +4797,7 @@
                     },
                     "fstream": {
                       "version": "1.0.10",
-                      "from": "fstream@>=1.0.10 <1.1.0",
+                      "from": "fstream@>=1.0.2 <2.0.0",
                       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
                       "dependencies": {
                         "graceful-fs": {
@@ -4330,7 +5130,7 @@
           "dependencies": {
             "strip-ansi": {
               "version": "3.0.1",
-              "from": "strip-ansi@>=3.0.0 <4.0.0",
+              "from": "strip-ansi@>=3.0.1 <4.0.0",
               "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "dependencies": {
                 "ansi-regex": {
@@ -4640,445 +5440,6 @@
           }
         }
       }
-    },
-    "zipfile": {
-      "version": "0.5.11",
-      "from": "cartodb/node-zipfile#0.5.11-cdb1",
-      "resolved": "git://github.com/cartodb/node-zipfile.git#558cc5a98f91857e279ce5a3389b0b840bab16b5",
-      "dependencies": {
-        "nan": {
-          "version": "2.4.0",
-          "from": "nan@>=2.4.0 <2.5.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
-        },
-        "node-pre-gyp": {
-          "version": "0.6.33",
-          "from": "node-pre-gyp@>=0.6.30 <0.7.0",
-          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz",
-          "dependencies": {
-            "mkdirp": {
-              "version": "0.5.1",
-              "from": "mkdirp@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "from": "minimist@0.0.8",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                }
-              }
-            },
-            "nopt": {
-              "version": "3.0.6",
-              "from": "nopt@>=3.0.6 <3.1.0",
-              "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-              "dependencies": {
-                "abbrev": {
-                  "version": "1.1.0",
-                  "from": "abbrev@>=1.0.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"
-                }
-              }
-            },
-            "npmlog": {
-              "version": "4.0.2",
-              "from": "npmlog@>=4.0.1 <5.0.0",
-              "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
-              "dependencies": {
-                "are-we-there-yet": {
-                  "version": "1.1.2",
-                  "from": "are-we-there-yet@>=1.1.2 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz",
-                  "dependencies": {
-                    "delegates": {
-                      "version": "1.0.0",
-                      "from": "delegates@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
-                    },
-                    "readable-stream": {
-                      "version": "2.2.2",
-                      "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz",
-                      "dependencies": {
-                        "buffer-shims": {
-                          "version": "1.0.0",
-                          "from": "buffer-shims@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-                        },
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "from": "core-util-is@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "from": "isarray@>=1.0.0 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                        },
-                        "inherits": {
-                          "version": "2.0.3",
-                          "from": "inherits@>=2.0.1 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.7",
-                          "from": "process-nextick-args@>=1.0.6 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "from": "string_decoder@>=0.10.0 <0.11.0",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "from": "util-deprecate@>=1.0.1 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "console-control-strings": {
-                  "version": "1.1.0",
-                  "from": "console-control-strings@>=1.1.0 <1.2.0",
-                  "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
-                },
-                "gauge": {
-                  "version": "2.7.3",
-                  "from": "gauge@>=2.7.1 <2.8.0",
-                  "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz",
-                  "dependencies": {
-                    "aproba": {
-                      "version": "1.1.1",
-                      "from": "aproba@>=1.0.3 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"
-                    },
-                    "has-unicode": {
-                      "version": "2.0.1",
-                      "from": "has-unicode@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
-                    },
-                    "object-assign": {
-                      "version": "4.1.1",
-                      "from": "object-assign@>=4.1.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-                    },
-                    "signal-exit": {
-                      "version": "3.0.2",
-                      "from": "signal-exit@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
-                    },
-                    "string-width": {
-                      "version": "1.0.2",
-                      "from": "string-width@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                      "dependencies": {
-                        "code-point-at": {
-                          "version": "1.1.0",
-                          "from": "code-point-at@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
-                        },
-                        "is-fullwidth-code-point": {
-                          "version": "1.0.0",
-                          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                          "dependencies": {
-                            "number-is-nan": {
-                              "version": "1.0.1",
-                              "from": "number-is-nan@>=1.0.0 <2.0.0",
-                              "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "strip-ansi": {
-                      "version": "3.0.1",
-                      "from": "strip-ansi@>=3.0.1 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                      "dependencies": {
-                        "ansi-regex": {
-                          "version": "2.1.1",
-                          "from": "ansi-regex@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-                        }
-                      }
-                    },
-                    "wide-align": {
-                      "version": "1.1.0",
-                      "from": "wide-align@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"
-                    }
-                  }
-                },
-                "set-blocking": {
-                  "version": "2.0.0",
-                  "from": "set-blocking@>=2.0.0 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-                }
-              }
-            },
-            "rc": {
-              "version": "1.1.7",
-              "from": "rc@>=1.1.6 <1.2.0",
-              "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz",
-              "dependencies": {
-                "deep-extend": {
-                  "version": "0.4.1",
-                  "from": "deep-extend@>=0.4.0 <0.5.0",
-                  "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
-                },
-                "ini": {
-                  "version": "1.3.4",
-                  "from": "ini@>=1.3.0 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-                },
-                "minimist": {
-                  "version": "1.2.0",
-                  "from": "minimist@>=1.2.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
-                },
-                "strip-json-comments": {
-                  "version": "2.0.1",
-                  "from": "strip-json-comments@>=2.0.1 <2.1.0",
-                  "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
-                }
-              }
-            },
-            "rimraf": {
-              "version": "2.5.4",
-              "from": "rimraf@>=2.5.4 <2.6.0",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-              "dependencies": {
-                "glob": {
-                  "version": "7.1.1",
-                  "from": "glob@>=7.0.5 <8.0.0",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-                  "dependencies": {
-                    "fs.realpath": {
-                      "version": "1.0.0",
-                      "from": "fs.realpath@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-                    },
-                    "inflight": {
-                      "version": "1.0.6",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.3",
-                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.6",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.4.2",
-                              "from": "balanced-match@>=0.4.1 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "once": {
-                      "version": "1.4.0",
-                      "from": "once@>=1.3.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-                      "dependencies": {
-                        "wrappy": {
-                          "version": "1.0.2",
-                          "from": "wrappy@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-                        }
-                      }
-                    },
-                    "path-is-absolute": {
-                      "version": "1.0.1",
-                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "from": "semver@>=5.3.0 <5.4.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
-            },
-            "tar": {
-              "version": "2.2.1",
-              "from": "tar@>=2.2.1 <2.3.0",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-              "dependencies": {
-                "block-stream": {
-                  "version": "0.0.9",
-                  "from": "block-stream@*",
-                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
-                },
-                "fstream": {
-                  "version": "1.0.10",
-                  "from": "fstream@>=1.0.10 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-                    }
-                  }
-                },
-                "inherits": {
-                  "version": "2.0.3",
-                  "from": "inherits@>=2.0.0 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                }
-              }
-            },
-            "tar-pack": {
-              "version": "3.3.0",
-              "from": "tar-pack@>=3.3.0 <3.4.0",
-              "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz",
-              "dependencies": {
-                "fstream": {
-                  "version": "1.0.10",
-                  "from": "fstream@>=1.0.10 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz",
-                  "dependencies": {
-                    "graceful-fs": {
-                      "version": "4.1.11",
-                      "from": "graceful-fs@>=4.1.2 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "from": "inherits@>=2.0.0 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                    }
-                  }
-                },
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "from": "fstream-ignore@>=1.0.5 <1.1.0",
-                  "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-                  "dependencies": {
-                    "inherits": {
-                      "version": "2.0.3",
-                      "from": "inherits@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                    },
-                    "minimatch": {
-                      "version": "3.0.3",
-                      "from": "minimatch@>=3.0.0 <4.0.0",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-                      "dependencies": {
-                        "brace-expansion": {
-                          "version": "1.1.6",
-                          "from": "brace-expansion@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
-                          "dependencies": {
-                            "balanced-match": {
-                              "version": "0.4.2",
-                              "from": "balanced-match@>=0.4.1 <0.5.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
-                            },
-                            "concat-map": {
-                              "version": "0.0.1",
-                              "from": "concat-map@0.0.1",
-                              "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "once": {
-                  "version": "1.3.3",
-                  "from": "once@>=1.3.3 <1.4.0",
-                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-                  "dependencies": {
-                    "wrappy": {
-                      "version": "1.0.2",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-                    }
-                  }
-                },
-                "readable-stream": {
-                  "version": "2.1.5",
-                  "from": "readable-stream@>=2.1.4 <2.2.0",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
-                  "dependencies": {
-                    "buffer-shims": {
-                      "version": "1.0.0",
-                      "from": "buffer-shims@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
-                    },
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "from": "core-util-is@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-                    },
-                    "inherits": {
-                      "version": "2.0.3",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-                    },
-                    "isarray": {
-                      "version": "1.0.0",
-                      "from": "isarray@>=1.0.0 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.7",
-                      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "from": "string_decoder@>=0.10.0 <0.11.0",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.2",
-                      "from": "util-deprecate@>=1.0.1 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-                    }
-                  }
-                },
-                "uid-number": {
-                  "version": "0.0.6",
-                  "from": "uid-number@>=0.0.6 <0.1.0",
-                  "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
-                }
-              }
-            }
-          }
-        }
-      }
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index ef91c343..8cbfe65b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -216,7 +216,15 @@ carto@0.16.3:
     semver "^5.1.0"
     yargs "^4.2.0"
 
-carto@cartodb/carto#0.15.1-cdb2, "carto@github:cartodb/carto#0.15.1-cdb1":
+carto@cartodb/carto#0.15.1-cdb2:
+  version "0.15.1-cdb1"
+  resolved "https://codeload.github.com/cartodb/carto/tar.gz/673cf381215948269827052afa152e485b01e2f0"
+  dependencies:
+    mapnik-reference "~6.0.2"
+    optimist "~0.6.0"
+    underscore "~1.6.0"
+
+"carto@github:cartodb/carto#0.15.1-cdb1":
   version "0.15.1-cdb1"
   resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
   dependencies:
@@ -693,7 +701,7 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
-generic-pool@2.4.2, generic-pool@~2.4.0, generic-pool@~2.4.1:
+generic-pool@2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683"
 
@@ -705,6 +713,10 @@ generic-pool@~2.2.0, generic-pool@~2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be"
 
+generic-pool@~2.4.0, generic-pool@~2.4.1:
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -715,7 +727,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob@3.2.3, "glob@~ 3.2.1":
+glob@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467"
   dependencies:
@@ -754,6 +766,13 @@ glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+"glob@~ 3.2.1":
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
+  dependencies:
+    inherits "2"
+    minimatch "0.3"
+
 graceful-fs@^4.1.2:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -1175,6 +1194,13 @@ mime@~1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
+minimatch@0.3:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.0.0"
+
 minimatch@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz#e0dd2120b49e1b724ce8d714c520822a9438576d"
@@ -1497,8 +1523,8 @@ postcss@5.0.19:
     supports-color "^3.1.2"
 
 postcss@^5.0.18, postcss@^5.2.5, postcss@~5.2.8:
-  version "5.2.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.14.tgz#47b4fbde363fd4f81e547f7e0e43d6d300267330"
+  version "5.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.15.tgz#a9e8685e50e06cc5b3fdea5297273246c26f5b30"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
@@ -1610,7 +1636,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@1.1, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@~1.1.9:
+readable-stream@1.1, readable-stream@~1.1.9:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
   dependencies:
@@ -1619,16 +1645,7 @@ readable-stream@1.1, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@~1.1.9
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~1.0.2:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@~2.1.4:
+"readable-stream@^2.0.0 || ^1.1.13", readable-stream@~2.1.4:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
   dependencies:
@@ -1640,6 +1657,15 @@ readable-stream@~2.1.4:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 redis-mpool@0.4.1, redis-mpool@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.4.1.tgz#d917c0a4ed57a1291a9c6eb35434e6c0b7046f80"
@@ -2142,8 +2168,8 @@ window-size@^0.2.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
 
 windshaft@cartodb/windshaft#mapnik-migration:
-  version "2.6.6"
-  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/8513b9e7b27f5bf39ffa00cd9e1038f7722b396a"
+  version "2.7.1"
+  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/4ff259e66e192ad0ce7a4a7cb7a6a2463f381990"
   dependencies:
     abaculus cartodb/abaculus#2.0.3-cdb1
     canvas cartodb/node-canvas#1.6.2-cdb2