From 875159fa5fd8124ac0fc61082b2a9daef245dc2b Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 18 May 2015 17:40:41 +0200
Subject: [PATCH 01/14] Upgrades cartodb-redis for `global` map stats

---
 NEWS.md             |   3 +
 npm-shrinkwrap.json | 426 ++++++++++++++++++++++++++++++++------------
 package.json        |   2 +-
 3 files changed, 313 insertions(+), 118 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 0c7a1805..1ab7e19f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades cartodb-redis for `global` map stats
+
 
 ## 2.2.0
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cca4c55b..576a11bd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -27,8 +27,8 @@
       }
     },
     "cartodb-redis": {
-      "version": "0.12.1",
-      "from": "cartodb-redis@~0.12.1",
+      "version": "0.13.0",
+      "from": "cartodb-redis@~0.13.0",
       "dependencies": {
         "redis-mpool": {
           "version": "0.1.0",
@@ -107,8 +107,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@~2.0.1"
                     }
                   }
                 }
@@ -142,14 +141,14 @@
               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
             },
             "mime-types": {
-              "version": "2.0.10",
+              "version": "2.0.11",
               "from": "mime-types@~2.0.1",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.8.0",
-                  "from": "mime-db@~1.8.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
+                  "version": "1.9.1",
+                  "from": "mime-db@~1.9.1",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
                 }
               }
             },
@@ -159,9 +158,9 @@
               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
             },
             "qs": {
-              "version": "2.4.1",
+              "version": "2.4.2",
               "from": "qs@~2.4.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz"
+              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"
             },
             "tunnel-agent": {
               "version": "0.4.0",
@@ -206,9 +205,9 @@
               "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "2.12.0",
+                  "version": "2.13.0",
                   "from": "hoek@2.x.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz"
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"
                 },
                 "boom": {
                   "version": "2.7.1",
@@ -255,13 +254,13 @@
               "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
             },
             "har-validator": {
-              "version": "1.6.1",
+              "version": "1.7.0",
               "from": "har-validator@^1.4.0",
-              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
               "dependencies": {
                 "bluebird": {
                   "version": "2.9.25",
-                  "from": "bluebird@^2.9.21",
+                  "from": "bluebird@^2.9.25",
                   "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"
                 },
                 "chalk": {
@@ -317,7 +316,7 @@
                 },
                 "commander": {
                   "version": "2.8.1",
-                  "from": "commander@^2.7.1",
+                  "from": "commander@^2.8.1",
                   "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
                   "dependencies": {
                     "graceful-readlink": {
@@ -328,9 +327,9 @@
                   }
                 },
                 "is-my-json-valid": {
-                  "version": "2.10.1",
-                  "from": "is-my-json-valid@^2.10.0",
-                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz",
+                  "version": "2.12.0",
+                  "from": "is-my-json-valid@^2.10.1",
+                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz",
                   "dependencies": {
                     "generate-function": {
                       "version": "2.0.0",
@@ -338,9 +337,9 @@
                       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                     },
                     "generate-object-property": {
-                      "version": "1.1.1",
+                      "version": "1.2.0",
                       "from": "generate-object-property@^1.1.0",
-                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz",
+                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
                       "dependencies": {
                         "is-property": {
                           "version": "1.0.2",
@@ -399,8 +398,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+              "from": "inherits@~2.0.1"
             }
           }
         }
@@ -547,9 +545,9 @@
                   "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
-                      "version": "0.0.2",
+                      "version": "0.0.3",
                       "from": "wordwrap@~0.0.2",
-                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                     },
                     "minimist": {
                       "version": "0.0.10",
@@ -691,19 +689,18 @@
                   }
                 },
                 "srs": {
-                  "version": "0.4.7",
+                  "version": "0.4.8",
                   "from": "srs@~0.4.1",
-                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.7.tgz",
+                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.8.tgz",
                   "dependencies": {
                     "nan": {
-                      "version": "1.7.0",
-                      "from": "nan@~1.7.0",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.7.0.tgz"
+                      "version": "1.8.4",
+                      "from": "nan@~1.8.4",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
                     },
                     "node-pre-gyp": {
-                      "version": "0.6.4",
-                      "from": "node-pre-gyp@~0.6.4",
-                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz",
+                      "version": "0.6.7",
+                      "from": "node-pre-gyp@~0.6.7",
                       "dependencies": {
                         "nopt": {
                           "version": "3.0.1",
@@ -718,9 +715,9 @@
                           }
                         },
                         "npmlog": {
-                          "version": "1.1.0",
-                          "from": "npmlog@>=1.1.0 <1.2.0",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz",
+                          "version": "1.2.0",
+                          "from": "npmlog@>=1.2.0 <1.3.0",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz",
                           "dependencies": {
                             "ansi": {
                               "version": "0.3.0",
@@ -728,21 +725,48 @@
                               "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
                             },
                             "are-we-there-yet": {
-                              "version": "1.0.2",
+                              "version": "1.0.4",
                               "from": "are-we-there-yet@>=1.0.0 <1.1.0",
-                              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz",
+                              "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz",
                               "dependencies": {
                                 "delegates": {
                                   "version": "0.1.0",
                                   "from": "delegates@>=0.1.0 <0.2.0",
                                   "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
+                                },
+                                "readable-stream": {
+                                  "version": "1.1.13",
+                                  "from": "readable-stream@>=1.1.13 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@>=1.0.0 <1.1.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.0 <0.11.0",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@>=2.0.1 <2.1.0",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
                                 }
                               }
                             },
                             "gauge": {
-                              "version": "1.1.0",
-                              "from": "gauge@>=1.1.0 <1.2.0",
-                              "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz",
+                              "version": "1.2.0",
+                              "from": "gauge@>=1.2.0 <1.3.0",
+                              "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz",
                               "dependencies": {
                                 "has-unicode": {
                                   "version": "1.0.0",
@@ -750,19 +774,19 @@
                                   "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"
                                 },
                                 "lodash.pad": {
-                                  "version": "3.0.0",
+                                  "version": "3.1.0",
                                   "from": "lodash.pad@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz",
                                   "dependencies": {
                                     "lodash._basetostring": {
                                       "version": "3.0.0",
                                       "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                                       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                                     },
-                                    "lodash._createpad": {
-                                      "version": "3.0.1",
-                                      "from": "lodash._createpad@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
+                                    "lodash._createpadding": {
+                                      "version": "3.6.0",
+                                      "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
                                       "dependencies": {
                                         "lodash.repeat": {
                                           "version": "3.0.0",
@@ -774,19 +798,19 @@
                                   }
                                 },
                                 "lodash.padleft": {
-                                  "version": "3.0.0",
+                                  "version": "3.1.1",
                                   "from": "lodash.padleft@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz",
                                   "dependencies": {
                                     "lodash._basetostring": {
                                       "version": "3.0.0",
                                       "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                                       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                                     },
-                                    "lodash._createpad": {
-                                      "version": "3.0.1",
-                                      "from": "lodash._createpad@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
+                                    "lodash._createpadding": {
+                                      "version": "3.6.0",
+                                      "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
                                       "dependencies": {
                                         "lodash.repeat": {
                                           "version": "3.0.0",
@@ -798,19 +822,19 @@
                                   }
                                 },
                                 "lodash.padright": {
-                                  "version": "3.0.0",
+                                  "version": "3.1.1",
                                   "from": "lodash.padright@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz",
+                                  "resolved": "https://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz",
                                   "dependencies": {
                                     "lodash._basetostring": {
                                       "version": "3.0.0",
                                       "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                                       "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"
                                     },
-                                    "lodash._createpad": {
-                                      "version": "3.0.1",
-                                      "from": "lodash._createpad@>=3.0.0 <4.0.0",
-                                      "resolved": "https://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz",
+                                    "lodash._createpadding": {
+                                      "version": "3.6.0",
+                                      "from": "lodash._createpadding@>=3.0.0 <4.0.0",
+                                      "resolved": "https://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz",
                                       "dependencies": {
                                         "lodash.repeat": {
                                           "version": "3.0.0",
@@ -826,9 +850,9 @@
                           }
                         },
                         "request": {
-                          "version": "2.53.0",
+                          "version": "2.55.0",
                           "from": "request@>=2.0.0 <3.0.0",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.53.0.tgz",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
                           "dependencies": {
                             "bl": {
                               "version": "0.9.4",
@@ -870,9 +894,9 @@
                               "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"
                             },
                             "forever-agent": {
-                              "version": "0.5.2",
-                              "from": "forever-agent@>=0.5.0 <0.6.0",
-                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                              "version": "0.6.1",
+                              "from": "forever-agent@>=0.6.0 <0.7.0",
+                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                             },
                             "form-data": {
                               "version": "0.2.0",
@@ -892,26 +916,26 @@
                               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
                             },
                             "mime-types": {
-                              "version": "2.0.9",
+                              "version": "2.0.10",
                               "from": "mime-types@>=2.0.1 <2.1.0",
-                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz",
                               "dependencies": {
                                 "mime-db": {
-                                  "version": "1.7.0",
-                                  "from": "mime-db@>=1.7.0 <1.8.0",
-                                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz"
+                                  "version": "1.8.0",
+                                  "from": "mime-db@>=1.8.0 <1.9.0",
+                                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"
                                 }
                               }
                             },
                             "node-uuid": {
-                              "version": "1.4.2",
+                              "version": "1.4.3",
                               "from": "node-uuid@>=1.4.0 <1.5.0",
-                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
+                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                             },
                             "qs": {
-                              "version": "2.3.3",
-                              "from": "qs@>=2.3.1 <2.4.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                              "version": "2.4.1",
+                              "from": "qs@>=2.4.0 <2.5.0",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.1.tgz"
                             },
                             "tunnel-agent": {
                               "version": "0.4.0",
@@ -919,16 +943,9 @@
                               "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                             },
                             "tough-cookie": {
-                              "version": "0.12.1",
+                              "version": "1.1.0",
                               "from": "tough-cookie@>=0.12.0",
-                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-                              "dependencies": {
-                                "punycode": {
-                                  "version": "1.3.2",
-                                  "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                                }
-                              }
+                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
                             },
                             "http-signature": {
                               "version": "0.10.1",
@@ -963,14 +980,14 @@
                               "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
                               "dependencies": {
                                 "hoek": {
-                                  "version": "2.11.0",
+                                  "version": "2.13.0",
                                   "from": "hoek@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz"
+                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"
                                 },
                                 "boom": {
-                                  "version": "2.6.1",
+                                  "version": "2.7.1",
                                   "from": "boom@>=2.0.0 <3.0.0",
-                                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.6.1.tgz"
+                                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.1.tgz"
                                 },
                                 "cryptiles": {
                                   "version": "2.0.4",
@@ -1007,21 +1024,130 @@
                               }
                             },
                             "isstream": {
-                              "version": "0.1.1",
+                              "version": "0.1.2",
                               "from": "isstream@>=0.1.1 <0.2.0",
-                              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"
+                              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+                            },
+                            "har-validator": {
+                              "version": "1.7.0",
+                              "from": "har-validator@>=1.4.0 <2.0.0",
+                              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
+                              "dependencies": {
+                                "bluebird": {
+                                  "version": "2.9.25",
+                                  "from": "bluebird@>=2.9.25 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"
+                                },
+                                "chalk": {
+                                  "version": "1.0.0",
+                                  "from": "chalk@>=1.0.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+                                  "dependencies": {
+                                    "ansi-styles": {
+                                      "version": "2.0.1",
+                                      "from": "ansi-styles@>=2.0.1 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
+                                    },
+                                    "escape-string-regexp": {
+                                      "version": "1.0.3",
+                                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                                    },
+                                    "has-ansi": {
+                                      "version": "1.0.3",
+                                      "from": "has-ansi@>=1.0.3 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                                      "dependencies": {
+                                        "ansi-regex": {
+                                          "version": "1.1.1",
+                                          "from": "ansi-regex@>=1.1.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                                        },
+                                        "get-stdin": {
+                                          "version": "4.0.1",
+                                          "from": "get-stdin@>=4.0.1 <5.0.0",
+                                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                                        }
+                                      }
+                                    },
+                                    "strip-ansi": {
+                                      "version": "2.0.1",
+                                      "from": "strip-ansi@>=2.0.1 <3.0.0",
+                                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                                      "dependencies": {
+                                        "ansi-regex": {
+                                          "version": "1.1.1",
+                                          "from": "ansi-regex@>=1.1.0 <2.0.0",
+                                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                                        }
+                                      }
+                                    },
+                                    "supports-color": {
+                                      "version": "1.3.1",
+                                      "from": "supports-color@>=1.3.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
+                                    }
+                                  }
+                                },
+                                "commander": {
+                                  "version": "2.8.1",
+                                  "from": "commander@>=2.8.1 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.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.10.1",
+                                  "from": "is-my-json-valid@>=2.10.1 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.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.1.1",
+                                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.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": "1.1.0",
+                                      "from": "jsonpointer@>=1.1.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"
+                                    },
+                                    "xtend": {
+                                      "version": "4.0.0",
+                                      "from": "xtend@>=4.0.0 <5.0.0",
+                                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"
+                                    }
+                                  }
+                                }
+                              }
                             }
                           }
                         },
                         "semver": {
-                          "version": "4.3.0",
-                          "from": "semver@>=4.3.0 <4.4.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.0.tgz"
+                          "version": "4.3.3",
+                          "from": "semver@>=4.3.2 <4.4.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.3.tgz"
                         },
                         "tar": {
-                          "version": "1.0.3",
-                          "from": "tar@>=1.0.2 <1.1.0",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz",
+                          "version": "2.1.0",
+                          "from": "tar@>=2.1.0 <2.2.0",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-2.1.0.tgz",
                           "dependencies": {
                             "block-stream": {
                               "version": "0.0.7",
@@ -1034,9 +1160,9 @@
                               "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz",
                               "dependencies": {
                                 "graceful-fs": {
-                                  "version": "3.0.5",
+                                  "version": "3.0.6",
                                   "from": "graceful-fs@>=3.0.0 <4.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                                 }
                               }
                             },
@@ -1067,15 +1193,20 @@
                               "from": "debug@>=0.7.2 <0.8.0",
                               "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
                             },
+                            "rimraf": {
+                              "version": "2.2.8",
+                              "from": "rimraf@>=2.2.0 <2.3.0",
+                              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                            },
                             "fstream": {
                               "version": "0.1.31",
                               "from": "fstream@>=0.1.22 <0.2.0",
                               "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
                               "dependencies": {
                                 "graceful-fs": {
-                                  "version": "3.0.5",
+                                  "version": "3.0.6",
                                   "from": "graceful-fs@>=3.0.2 <3.1.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz"
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
@@ -1112,9 +1243,9 @@
                                   "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                                   "dependencies": {
                                     "lru-cache": {
-                                      "version": "2.5.0",
+                                      "version": "2.6.2",
                                       "from": "lru-cache@>=2.0.0 <3.0.0",
-                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"
                                     },
                                     "sigmund": {
                                       "version": "1.0.0",
@@ -1152,7 +1283,7 @@
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "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.1.tgz"
                                 }
                               }
@@ -1177,9 +1308,9 @@
                           }
                         },
                         "rc": {
-                          "version": "0.6.0",
-                          "from": "rc@>=0.6.0 <0.7.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.6.0.tgz",
+                          "version": "1.0.1",
+                          "from": "rc@>=1.0.1 <1.1.0",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-1.0.1.tgz",
                           "dependencies": {
                             "minimist": {
                               "version": "0.0.10",
@@ -1204,9 +1335,71 @@
                           }
                         },
                         "rimraf": {
-                          "version": "2.2.8",
-                          "from": "rimraf@>=2.2.8 <2.3.0",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                          "version": "2.3.3",
+                          "from": "rimraf@>=2.3.2 <2.4.0",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz",
+                          "dependencies": {
+                            "glob": {
+                              "version": "4.5.3",
+                              "from": "glob@>=4.4.2 <5.0.0",
+                              "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                              "dependencies": {
+                                "inflight": {
+                                  "version": "1.0.4",
+                                  "from": "inflight@>=1.0.4 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.1",
+                                      "from": "wrappy@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@>=2.0.0 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                },
+                                "minimatch": {
+                                  "version": "2.0.7",
+                                  "from": "minimatch@>=2.0.1 <3.0.0",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz",
+                                  "dependencies": {
+                                    "brace-expansion": {
+                                      "version": "1.1.0",
+                                      "from": "brace-expansion@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                                      "dependencies": {
+                                        "balanced-match": {
+                                          "version": "0.2.0",
+                                          "from": "balanced-match@>=0.2.0 <0.3.0",
+                                          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.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.1",
+                                  "from": "once@>=1.3.0 <2.0.0",
+                                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
+                                  "dependencies": {
+                                    "wrappy": {
+                                      "version": "1.0.1",
+                                      "from": "wrappy@>=1.0.0 <2.0.0",
+                                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
                         }
                       }
                     }
@@ -2039,9 +2232,9 @@
                   "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
-                      "version": "0.0.2",
+                      "version": "0.0.3",
                       "from": "wordwrap@~0.0.2",
-                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                     },
                     "minimist": {
                       "version": "0.0.10",
@@ -2099,9 +2292,9 @@
               "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2",
+                  "version": "0.0.3",
                   "from": "wordwrap@~0.0.2",
-                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                 },
                 "minimist": {
                   "version": "0.0.10",
@@ -2542,9 +2735,9 @@
               "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2",
+                  "version": "0.0.3",
                   "from": "wordwrap@~0.0.2",
-                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                 },
                 "minimist": {
                   "version": "0.0.10",
@@ -2597,8 +2790,7 @@
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@~2.0.1",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                      "from": "inherits@~2.0.1"
                     }
                   }
                 }
diff --git a/package.json b/package.json
index dec3b240..b1411e6d 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",
-        "cartodb-redis": "~0.12.1",
+        "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
         "redis-mpool": "~0.3.0",

From ebe38e977f3dbcf0edd1af6d2ed8f86d340ef485 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 18 May 2015 18:10:47 +0200
Subject: [PATCH 02/14] Release 2.3.0

---
 NEWS.md             | 4 ++--
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 1ab7e19f..56227962 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## 2.2.1
+## 2.3.0
 
-Released 2015-mm-dd
+Released 2015-05-18
 
 Announcements:
  - Upgrades cartodb-redis for `global` map stats
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 576a11bd..b70daa30 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index b1411e6d..a5861ea8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 9ee69dea555c5a088fe0fd10d488111f71056fa1 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 18 May 2015 18:11:48 +0200
Subject: [PATCH 03/14] Stubs next version

---
 NEWS.md             | 5 +++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 56227962..05e50853 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.3.1
+
+Released 2015-mm-dd
+
+
 ## 2.3.0
 
 Released 2015-05-18
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b70daa30..993a25c6 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index a5861ea8..e27490b4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 7a45c9e43489d31a33a3481e82ee23c8f054ce4e Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 26 May 2015 15:39:21 +0200
Subject: [PATCH 04/14] Bumps windshaft version to 0.44.0  - adds a test to
 validate metadata is returned for unrolled named layers

---
 NEWS.md                         |  5 +-
 npm-shrinkwrap.json             | 66 +++++++++++++-------------
 package.json                    |  4 +-
 test/acceptance/named_layers.js | 83 +++++++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 36 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 05e50853..ffa62d79 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,12 @@
 # Changelog
 
-## 2.3.1
+## 2.4.0
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [0.44.0](https://github.com/CartoDB/Windshaft/releases/tag/0.44.0)
+
 
 ## 2.3.0
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 993a25c6..d05d2ab3 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -129,26 +129,26 @@
               "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
               "dependencies": {
                 "async": {
-                  "version": "0.9.0",
+                  "version": "0.9.2",
                   "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                 }
               }
             },
             "json-stringify-safe": {
-              "version": "5.0.0",
+              "version": "5.0.1",
               "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
-              "version": "2.0.11",
+              "version": "2.0.12",
               "from": "mime-types@~2.0.1",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.9.1",
-                  "from": "mime-db@~1.9.1",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"
+                  "version": "1.10.0",
+                  "from": "mime-db@~1.10.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz"
                 }
               }
             },
@@ -168,9 +168,9 @@
               "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
             },
             "tough-cookie": {
-              "version": "1.1.0",
+              "version": "1.2.0",
               "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
             },
             "http-signature": {
               "version": "0.10.1",
@@ -205,14 +205,14 @@
               "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "2.13.0",
+                  "version": "2.14.0",
                   "from": "hoek@2.x.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz"
                 },
                 "boom": {
-                  "version": "2.7.1",
+                  "version": "2.7.2",
                   "from": "boom@2.x.x",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.1.tgz"
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.7.2.tgz"
                 },
                 "cryptiles": {
                   "version": "2.0.4",
@@ -259,9 +259,9 @@
               "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
               "dependencies": {
                 "bluebird": {
-                  "version": "2.9.25",
+                  "version": "2.9.26",
                   "from": "bluebird@^2.9.25",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz"
                 },
                 "chalk": {
                   "version": "1.0.0",
@@ -464,9 +464,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.43.0",
-      "from": "windshaft@0.43.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.43.0.tgz",
+      "version": "0.44.0",
+      "from": "windshaft@0.44.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.44.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -579,9 +579,9 @@
                       "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
                     },
                     "json-stringify-safe": {
-                      "version": "5.0.0",
+                      "version": "5.0.1",
                       "from": "json-stringify-safe@~5.0.0",
-                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                     },
                     "forever-agent": {
                       "version": "0.5.2",
@@ -594,9 +594,9 @@
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                     },
                     "tough-cookie": {
-                      "version": "1.1.0",
+                      "version": "1.2.0",
                       "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
                     },
                     "form-data": {
                       "version": "0.1.4",
@@ -616,9 +616,9 @@
                           }
                         },
                         "async": {
-                          "version": "0.9.0",
+                          "version": "0.9.2",
                           "from": "async@~0.9.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                         }
                       }
                     },
@@ -2817,16 +2817,16 @@
                   "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "async": {
-                  "version": "0.9.0",
+                  "version": "0.9.2",
                   "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                 }
               }
             },
             "json-stringify-safe": {
-              "version": "5.0.0",
+              "version": "5.0.1",
               "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
               "version": "1.0.2",
@@ -2849,9 +2849,9 @@
               "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
             },
             "tough-cookie": {
-              "version": "1.1.0",
+              "version": "1.2.0",
               "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
             },
             "http-signature": {
               "version": "0.10.1",
diff --git a/package.json b/package.json
index e27490b4..c99c229c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.3.1",
+    "version": "2.4.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.43.0",
+        "windshaft": "0.44.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",
diff --git a/test/acceptance/named_layers.js b/test/acceptance/named_layers.js
index 1f1f6fa4..72425784 100644
--- a/test/acceptance/named_layers.js
+++ b/test/acceptance/named_layers.js
@@ -44,6 +44,7 @@ describe('named_layers', function() {
         },
         layergroup: {
             layers: [
+                wadusLayer,
                 wadusLayer
             ]
         }
@@ -634,6 +635,88 @@ describe('named_layers', function() {
 
     });
 
+    it('should return metadata for named layers', function(done) {
+
+        var layergroup =  {
+            version: '1.3.0',
+            layers: [
+                {
+                    type: 'plain',
+                    options: {
+                        color: '#fabada'
+                    }
+                },
+                {
+                    type: 'cartodb',
+                    options: {
+                        sql: 'select * from test_table',
+                        cartocss: '#layer { marker-fill: #cc3300; }',
+                        cartocss_version: '2.3.0'
+                    }
+                },
+                {
+                    type: 'named',
+                    options: {
+                        name: templateName
+                    }
+                },
+                {
+                    type: 'torque',
+                    options: {
+                        sql: "select * from test_table LIMIT 0",
+                        cartocss: "Map { -torque-frame-count:1; -torque-resolution:1; " +
+                        "-torque-aggregation-function:'count(*)'; -torque-time-attribute:'updated_at'; }"
+                    }
+                }
+            ]
+        };
+
+        step(
+            function createLayergroup() {
+                var next = this;
+                assert.response(server,
+                    {
+                        url: '/api/v1/map',
+                        method: 'POST',
+                        headers: {
+                            host: 'localhost',
+                            'Content-Type': 'application/json'
+                        },
+                        data: JSON.stringify(layergroup)
+                    },
+                    {
+                        status: 200
+                    },
+                    function(res, err) {
+                        next(err, res);
+                    }
+                );
+            },
+            function checkLayergroup(err, response) {
+                if (err) {
+                    throw err;
+                }
+
+                var parsedBody = JSON.parse(response.body);
+                assert.ok(parsedBody.metadata);
+                assert.ok(parsedBody.metadata.layers);
+                assert.equal(parsedBody.metadata.layers.length, 5);
+                assert.equal(parsedBody.metadata.layers[0].type, 'plain');
+                assert.equal(parsedBody.metadata.layers[1].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[2].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[3].type, 'mapnik');
+                assert.equal(parsedBody.metadata.layers[4].type, 'torque');
+
+                return null;
+            },
+            function finish(err) {
+                done(err);
+            }
+        );
+
+    });
+
+
 
     after(function(done) {
         global.environment.enabledFeatures = {cdbQueryTablesFromPostgres: false};

From 12cb199803b61f3996b7dd605ec2e79edc731376 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 26 May 2015 15:52:28 +0200
Subject: [PATCH 05/14] Release 2.4.0

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index ffa62d79..8ab4841f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 2.4.0
 
-Released 2015-mm-dd
+Released 2015-05-26
 
 Announcements:
  - Upgrades windshaft to [0.44.0](https://github.com/CartoDB/Windshaft/releases/tag/0.44.0)

From 654905a79c3f6f99c4a55eb2780ce8aadfee1fb2 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 26 May 2015 15:53:07 +0200
Subject: [PATCH 06/14] Stubs next version

---
 NEWS.md             | 5 +++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 8ab4841f..fac6db5c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.4.1
+
+Released 2015-mm-dd
+
+
 ## 2.4.0
 
 Released 2015-05-26
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d05d2ab3..d2474ccf 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index c99c229c..90b531f6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 488c2462229474db21ba40b61a93edf83e6493b5 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 28 May 2015 15:10:55 +0200
Subject: [PATCH 07/14] Documentation about layers metadata and layer selection

---
 docs/Map-API.md | 117 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 92 insertions(+), 25 deletions(-)

diff --git a/docs/Map-API.md b/docs/Map-API.md
index ef00137b..aab6554e 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -18,7 +18,7 @@ Here is an example of how to create an anonymous map with JavaScript:
 
 ```javascript
 var mapconfig = {
-  "version": "1.0.1",
+  "version": "1.3.1",
   "layers": [{
     "type": "cartodb",
     "options": {
@@ -57,7 +57,7 @@ The following map config sets up a map of European countries that have a white f
   },
   "layergroup": {
     "layers": [{
-      "type": "cartodb",
+      "type": "mapnik",
       "options": {
         "cartocss_version": "2.1.1",
         "cartocss": "#layer { polygon-fill: #FFF; }",
@@ -82,14 +82,23 @@ To get the `URL` to fetch the tiles you need to instantiate the map, where `temp
 curl -X POST 'https://{account}.cartodb.com/api/v1/map/named/:template_id' -H 'Content-Type: application/json'
 ```
 
-The response will return JSON with properties for the `layergroupid` and the timestamp (`last_updated`) of the last data modification. 
+The response will return JSON with properties for the `layergroupid`, the timestamp (`last_updated`) of the last data modification and some key/value pairs with `metadata` for the `layers`.
+Note: all `layers` in `metadata` will always have a `type` string and a `meta` dictionary with the key/value pairs.
 
 Here is an example response:
 
 ```javascript
 {
   "layergroupid": "c01a54877c62831bb51720263f91fb33:0",
-  "last_updated": "1970-01-01T00:00:00.000Z"
+  "last_updated": "1970-01-01T00:00:00.000Z",
+  "metadata": {
+    "layers": [
+      {
+        "type": "mapnik",
+        "meta": {}
+      }
+    ]
+  }
 }
 ```
 
@@ -144,9 +153,9 @@ POST /api/v1/map
 
 ```javascript
 {
-  "version": "1.0.1",
+  "version": "1.3.0",
   "layers": [{
-    "type": "cartodb",
+    "type": "mapnik",
     "options": {
       "cartocss_version": "2.1.1", 
       "cartocss": "#layer { polygon-fill: #FFF; }",
@@ -173,8 +182,9 @@ The response includes:
 - **updated_at**  
   The ISO date of the last time the data involved in the query was updated.
 
-- **metadata** *(optional)*  
-  Includes information about the layers. Some layers may not have metadata.
+- **metadata**
+  Includes information about the layers.
+  -
 
 - **cdn_url**  
   URLs to fetch the data using the best CDN for your zone.
@@ -189,8 +199,16 @@ curl 'https://documentation.cartodb.com/api/v1/map' -H 'Content-Type: applicatio
 <div class="code-title">RESPONSE</div>
 ```javascript
 {
-  "layergroupid":"c01a54877c62831bb51720263f91fb33:0",
-  "last_updated":"1970-01-01T00:00:00.000Z"
+  "layergroupid": "c01a54877c62831bb51720263f91fb33:0",
+  "last_updated": "1970-01-01T00:00:00.000Z",
+  "metadata": {
+    "layers": [
+      {
+        "type": "mapnik",
+        "meta": {}
+      }
+    ]
+  },
   "cdn_url": {
     "http": "http://cdb.com",
     "https": "https://cdb.com"
@@ -198,19 +216,35 @@ curl 'https://documentation.cartodb.com/api/v1/map' -H 'Content-Type: applicatio
 }
 ```
 
-The tiles can be accessed using:
+##### Retrieve resources from the layergroup
+
+###### Mapnik tiles can be accessed using:
+
+This tiles will get just the mapnik layers. To get individual layers see next section.
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/{z}/{x}/{y}.png
 ```
 
-For UTF grid tiles:
+###### Individual layers
+
+The MapConfig specification holds the layers definition in a 0-based index. Layers can be requested individually in different formats depending on the layer type.
+
+Individual layers can be accessed using that 0-based index. For UTF grid tiles:
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/{z}/{x}/{y}.grid.json
 ```
 
-For attributes defined in `attributes` section:
+In this case, `:layer` as 0 returns the UTF grid tiles/attributes for layer 0, the only layer in the example MapConfig.
+
+If the MapConfig had a torque layer at index 1 it could be possible to request it with:
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/1/{z}/{x}/{y}.torque.json
+```
+
+###### Attributes defined in `attributes` section:
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/attributes/:feature_id
@@ -219,10 +253,43 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 Which returns JSON with the attributes defined, like:
 
 ```javascript
-{ c: 1, d: 2 }
+{ "c": 1, "d": 2 }
 ```
 
-Notice UTF Grid and attributes endpoints need an integer parameter, ``layer``. That number is the 0-based index of the layer inside the mapconfig. In this case, 0 returns the UTF grid tiles/attributes for layer 0, the only layer in the example mapconfig. If a second layer was available it could be returned with 1, a third layer with 2, etc.
+###### Blending and layer selection
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer_filter/{z}/{x}/{y}.png
+```
+
+Note: currently format is limited to `png`.
+
+`:layer_filter` can be used to select some layers to be rendered together. :layer_filter supports two formats:
+
+- `all` alias
+
+Using `all` as `:layer_filter` will blend all layers in the layergroup
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/all/{z}/{x}/{y}.png
+```
+
+- Filter by layer index
+
+A list of comma separated layer indexes can be used to just render a subset of layers. For example `0,3,4` will filter and blend layers with indexes 0, 3 and 4.
+
+```bash
+https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/0,3,4/{z}/{x}/{y}.png
+```
+
+Some notes about filtering:
+  * Invalid index values or out of bounds indexes will end in `Invalid layer filtering` errors.
+  * Once a mapnik layer is selected all mapnik layers will get blended. As this may change in the future **it is
+  recommended** to always select all mapnik layers if you want to select at least one so you will get a consistent
+  behaviour in the future.
+  * Ordering is not considered. So right now filtering layers 0,3,4 is the very same thing as filtering 3,4,0. As this
+  may change in the future **it is recommended** to always select the layers in ascending order so you will get a
+  consistent behaviour in the future.
 
 ### Create JSONP
 
@@ -272,7 +339,7 @@ Anonymous maps cannot be removed by an API call. They will expire after about fi
 
 ## Named Maps
 
-Named maps are essentially the same as anonymous maps except the mapconfig is stored on the server and the map is given a unique name. Two other big differences are: you can create named maps from private data and that users without an API Key can see them even though they are from that private data.
+Named maps are essentially the same as anonymous maps except the MapConfig is stored on the server and the map is given a unique name. Two other big differences are: you can create named maps from private data and that users without an API Key can see them even though they are from that private data.
 
 The main two differences compared to anonymous maps are:
 
@@ -280,7 +347,7 @@ The main two differences compared to anonymous maps are:
   This allows you to control who is able to see the map based on a token auth
 
 - **templates**  
-  Since the mapconfig is static it can contain some variables so the client can modify the map's appearance using those variables.
+  Since the MapConfig is static it can contain some variables so the client can modify the map's appearance using those variables.
 
 Template maps are persistent with no preset expiration. They can only be created or deleted by a CartoDB user with a valid API_KEY (see auth section).
 
@@ -672,13 +739,13 @@ cartodb.createLayer('map_dom_id',layerSource)
 1. [layer.setParams()](http://docs.cartodb.com/cartodb-platform/cartodb-js.html#layersetparamskey-value) allows you to change the template variables (in the placeholders object) via JavaScript 
 2. [layer.setAuthToken()](http://docs.cartodb.com/cartodb-platform/cartodb-js.html#layersetauthtokenauthtoken) allows you to set the auth tokens to create the layer
 
-##Static Maps API
+## Static Maps API
 
 The Static Maps API can be initiated using both named and anonymous maps using the 'layergroupid' token. The API can be used to create static images of parts of maps and thumbnails for use in web design, graphic design, print, field work, and many other applications that require standard image formats.
 
 ### Maps API endpoints
 
-Begin by instantiating either a named or anonymous map using the `layergroupid token` as demonstrated in the Maps API documentation above. The `layergroupsid token` calls to the map and allows for parameters in the definition to generate static images. 
+Begin by instantiating either a named or anonymous map using the `layergroupid token` as demonstrated in the Maps API documentation above. The `layergroupid` token calls to the map and allows for parameters in the definition to generate static images.
 
 ##### Definition
 
@@ -779,14 +846,14 @@ By manipulating the `"urlTemplate"` custom basemaps can be used in generating st
     },
 ```
 
-Additoinally, static images from Torque maps and other map layers can be used together to generate highly customizable and versatile static maps.
+Additionally, static images from Torque maps and other map layers can be used together to generate highly customizable and versatile static maps.
 
 
-####Caching
+#### Caching
 
 It is important to note that generated images are cached from the live data referenced with the `layergroupid token` on the specified CartoDB account. This means that if the data changes, the cached image will also change. When linking dynamically, it is important to take into consideration the state of the data and longevity of the static image to avoid broken images or changes in how the image is displayed. To obtain a static snapshot of the map as it is today and preserve the image long-term regardless of changes in data, the image must be saved and stored locally.
 
-####Limits
+#### Limits
 
 * While images can encompass an entirety of a map, the default limit for pixel range is 8192 x 8192.
 * Image resolution by default is set to 72 DPI
@@ -803,10 +870,10 @@ After instantiating a map from a CartoDB account:
  GET /api/v1/map/static/center/4b615ff367e498e770e7d05e99181873:1420231989550.8699/14/40.71502926732618/-73.96039009094238/600/400.png
 ```
 
-####Response
-<div clas="wrap"><p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>,</div>
+#### Response
+<div class="wrap"><p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>,</div>
 
-####MapConfig
+#### MapConfig
 
 For this map, the multiple layers, order, and stylings are defined by the MapConfig.
 

From 14e13899a618f030374b6a30c7cebd340255a11f Mon Sep 17 00:00:00 2001
From: Andy Eschbacher <eschbacher@cartodb.com>
Date: Thu, 28 May 2015 11:02:34 -0400
Subject: [PATCH 08/14] made minor changes

---
 docs/Map-API.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/Map-API.md b/docs/Map-API.md
index aab6554e..5a34d2de 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -220,7 +220,7 @@ curl 'https://documentation.cartodb.com/api/v1/map' -H 'Content-Type: applicatio
 
 ###### Mapnik tiles can be accessed using:
 
-This tiles will get just the mapnik layers. To get individual layers see next section.
+These tiles will get just the mapnik layers. To get individual layers see next section.
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/{z}/{x}/{y}.png
@@ -238,7 +238,7 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 
 In this case, `:layer` as 0 returns the UTF grid tiles/attributes for layer 0, the only layer in the example MapConfig.
 
-If the MapConfig had a torque layer at index 1 it could be possible to request it with:
+If the MapConfig had a Torque layer at index 1 it could be possible to request it with:
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/1/{z}/{x}/{y}.torque.json
@@ -264,7 +264,7 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 
 Note: currently format is limited to `png`.
 
-`:layer_filter` can be used to select some layers to be rendered together. :layer_filter supports two formats:
+`:layer_filter` can be used to select some layers to be rendered together. `:layer_filter` supports two formats:
 
 - `all` alias
 
@@ -276,7 +276,7 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 
 - Filter by layer index
 
-A list of comma separated layer indexes can be used to just render a subset of layers. For example `0,3,4` will filter and blend layers with indexes 0, 3 and 4.
+A list of comma separated layer indexes can be used to just render a subset of layers. For example `0,3,4` will filter and blend layers with indexes 0, 3, and 4.
 
 ```bash
 https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/0,3,4/{z}/{x}/{y}.png
@@ -284,12 +284,12 @@ https://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/
 
 Some notes about filtering:
   * Invalid index values or out of bounds indexes will end in `Invalid layer filtering` errors.
-  * Once a mapnik layer is selected all mapnik layers will get blended. As this may change in the future **it is
+  * Once a mapnik layer is selected, all mapnik layers will get blended. As this may change in the future **it is
   recommended** to always select all mapnik layers if you want to select at least one so you will get a consistent
-  behaviour in the future.
+  behavior in the future.
   * Ordering is not considered. So right now filtering layers 0,3,4 is the very same thing as filtering 3,4,0. As this
   may change in the future **it is recommended** to always select the layers in ascending order so you will get a
-  consistent behaviour in the future.
+  consistent behavior in the future.
 
 ### Create JSONP
 

From 69abf8d9b17c514bd857999190c20084078e8555 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 1 Jun 2015 11:35:57 +0200
Subject: [PATCH 09/14] uses windshaft's master branch

---
 npm-shrinkwrap.json | 84 ++++++++++++++++++++++++++-------------------
 package.json        |  2 +-
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d05d2ab3..88f647f1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -76,9 +76,9 @@
       "from": "fastly-purge@~1.0.0",
       "dependencies": {
         "request": {
-          "version": "2.55.0",
+          "version": "2.57.0",
           "from": "request@^2.55.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.55.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.57.0.tgz",
           "dependencies": {
             "bl": {
               "version": "0.9.4",
@@ -114,9 +114,9 @@
               }
             },
             "caseless": {
-              "version": "0.9.0",
-              "from": "caseless@~0.9.0",
-              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"
+              "version": "0.10.0",
+              "from": "caseless@~0.10.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"
             },
             "forever-agent": {
               "version": "0.6.1",
@@ -132,6 +132,18 @@
                   "version": "0.9.2",
                   "from": "async@~0.9.0",
                   "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+                },
+                "combined-stream": {
+                  "version": "0.0.7",
+                  "from": "combined-stream@~0.0.4",
+                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.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"
+                    }
+                  }
                 }
               }
             },
@@ -141,14 +153,14 @@
               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
-              "version": "2.0.12",
+              "version": "2.0.13",
               "from": "mime-types@~2.0.1",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.13.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.10.0",
-                  "from": "mime-db@~1.10.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz"
+                  "version": "1.11.0",
+                  "from": "mime-db@~1.11.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.11.0.tgz"
                 }
               }
             },
@@ -158,9 +170,9 @@
               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
             },
             "qs": {
-              "version": "2.4.2",
-              "from": "qs@~2.4.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz"
+              "version": "3.1.0",
+              "from": "qs@~3.1.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
             },
             "tunnel-agent": {
               "version": "0.4.0",
@@ -173,9 +185,9 @@
               "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.2.0.tgz"
             },
             "http-signature": {
-              "version": "0.10.1",
-              "from": "http-signature@~0.10.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "version": "0.11.0",
+              "from": "http-signature@~0.11.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
               "dependencies": {
                 "assert-plus": {
                   "version": "0.1.5",
@@ -195,9 +207,9 @@
               }
             },
             "oauth-sign": {
-              "version": "0.6.0",
-              "from": "oauth-sign@~0.6.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"
+              "version": "0.8.0",
+              "from": "oauth-sign@~0.8.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
             },
             "hawk": {
               "version": "2.3.1",
@@ -237,14 +249,14 @@
               "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
             },
             "combined-stream": {
-              "version": "0.0.7",
-              "from": "combined-stream@~0.0.5",
-              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+              "version": "1.0.3",
+              "from": "combined-stream@~1.0.1",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.3.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"
+                  "version": "1.0.0",
+                  "from": "delayed-stream@^1.0.0",
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                 }
               }
             },
@@ -254,14 +266,14 @@
               "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
             },
             "har-validator": {
-              "version": "1.7.0",
-              "from": "har-validator@^1.4.0",
-              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz",
+              "version": "1.7.1",
+              "from": "har-validator@^1.6.1",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz",
               "dependencies": {
                 "bluebird": {
-                  "version": "2.9.26",
-                  "from": "bluebird@^2.9.25",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz"
+                  "version": "2.9.27",
+                  "from": "bluebird@^2.9.26",
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.27.tgz"
                 },
                 "chalk": {
                   "version": "1.0.0",
@@ -285,7 +297,7 @@
                       "dependencies": {
                         "ansi-regex": {
                           "version": "1.1.1",
-                          "from": "ansi-regex@^1.1.0",
+                          "from": "ansi-regex@^1.0.0",
                           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                         },
                         "get-stdin": {
@@ -328,7 +340,7 @@
                 },
                 "is-my-json-valid": {
                   "version": "2.12.0",
-                  "from": "is-my-json-valid@^2.10.1",
+                  "from": "is-my-json-valid@^2.12.0",
                   "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz",
                   "dependencies": {
                     "generate-function": {
@@ -464,9 +476,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.44.0",
-      "from": "windshaft@0.44.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.44.0.tgz",
+      "version": "0.44.1",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/master",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/master",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
diff --git a/package.json b/package.json
index c99c229c..5f06916b 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.44.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/master",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

From 044d49c53a955801c87548b8c01b71cc07fa253f Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 1 Jun 2015 12:20:44 +0200
Subject: [PATCH 10/14] Uses windshaft 0.44.1 from registry

---
 npm-shrinkwrap.json | 8 ++++----
 package.json        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 88f647f1..132524e0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -297,7 +297,7 @@
                       "dependencies": {
                         "ansi-regex": {
                           "version": "1.1.1",
-                          "from": "ansi-regex@^1.0.0",
+                          "from": "ansi-regex@^1.1.0",
                           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                         },
                         "get-stdin": {
@@ -314,7 +314,7 @@
                       "dependencies": {
                         "ansi-regex": {
                           "version": "1.1.1",
-                          "from": "ansi-regex@^1.0.0",
+                          "from": "ansi-regex@1.1.1",
                           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
                         }
                       }
@@ -477,8 +477,8 @@
     },
     "windshaft": {
       "version": "0.44.1",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/master",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/master",
+      "from": "windshaft@0.44.1",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.44.1.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
diff --git a/package.json b/package.json
index 5f06916b..e1fe26b0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/master",
+        "windshaft": "0.44.1",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

From 61158b62f1ca50cf3afe3037fd4aa885538f710a Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 1 Jun 2015 15:46:32 +0200
Subject: [PATCH 11/14] Update news

---
 NEWS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index fac6db5c..6496ce9e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [0.44.1](https://github.com/CartoDB/Windshaft/releases/tag/0.44.1)
+
 
 ## 2.4.0
 

From e17b374fdec18961a6493365a4bc32a07dbfde22 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 1 Jun 2015 15:49:30 +0200
Subject: [PATCH 12/14] Release 2.4.1

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 6496ce9e..da55fd3b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 2.4.1
 
-Released 2015-mm-dd
+Released 2015-06-01
 
 Announcements:
  - Upgrades windshaft to [0.44.1](https://github.com/CartoDB/Windshaft/releases/tag/0.44.1)

From aa3b336e46ce473e1fff43e6e2aac58ef49619f9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 1 Jun 2015 15:50:53 +0200
Subject: [PATCH 13/14] Stubs next version

---
 NEWS.md             | 6 ++++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index da55fd3b..f4404444 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.4.2
+
+Released 2015-mm-dd
+
+
+
 ## 2.4.1
 
 Released 2015-06-01
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3e7a156c..73339ccd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index 569c8e88..16647e98 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 9bd0a3f1c9abc9d633549bb63fdedb9b2e8ff794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= <matallo@cartodb.com>
Date: Mon, 1 Jun 2015 17:00:53 +0200
Subject: [PATCH 14/14] Update Map-API.md

---
 docs/Map-API.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 5a34d2de..54ff18c6 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -871,7 +871,8 @@ After instantiating a map from a CartoDB account:
 ```
 
 #### Response
-<div class="wrap"><p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>,</div>
+
+<p class="wrap-border"><img src="https://raw.githubusercontent.com/namessanti/Pictures/master/static_api.png" alt="static-api"/></p>
 
 #### MapConfig