From 697f3473f6a625211a0344962a7f1c010e7bc314 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 21 Oct 2014 14:46:53 +0200
Subject: [PATCH 01/22] Use pgraster branch from windshaft

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

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3815766f..01e75b8d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -92,7 +92,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2"
+              "from": "inherits@~2.0.1"
             }
           }
         }
@@ -169,9 +169,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.31.0",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.31.0",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.31.0",
+      "version": "0.31.1",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/pgraster",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/pgraster",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -1499,6 +1499,49 @@
             }
           }
         },
+        "tilelive": {
+          "version": "4.5.3",
+          "from": "tilelive@~4.5.3",
+          "dependencies": {
+            "optimist": {
+              "version": "0.6.1",
+              "from": "optimist@~0.6.0",
+              "dependencies": {
+                "wordwrap": {
+                  "version": "0.0.2",
+                  "from": "wordwrap@~0.0.2"
+                },
+                "minimist": {
+                  "version": "0.0.10",
+                  "from": "minimist@~0.0.1"
+                }
+              }
+            },
+            "sphericalmercator": {
+              "version": "1.0.2",
+              "from": "sphericalmercator@~1.0.1"
+            }
+          }
+        },
+        "tilelive-mapnik": {
+          "version": "0.6.12",
+          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
+          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
+          "dependencies": {
+            "generic-pool": {
+              "version": "2.1.1",
+              "from": "generic-pool@~2.1.1"
+            },
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@~1.2.11"
+            },
+            "sphericalmercator": {
+              "version": "1.0.2",
+              "from": "sphericalmercator@~1.0.2"
+            }
+          }
+        },
         "mapnik": {
           "version": "1.4.15",
           "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
@@ -1882,49 +1925,6 @@
             }
           }
         },
-        "tilelive": {
-          "version": "4.5.3",
-          "from": "tilelive@~4.5.3",
-          "dependencies": {
-            "optimist": {
-              "version": "0.6.1",
-              "from": "optimist@~0.6.0",
-              "dependencies": {
-                "wordwrap": {
-                  "version": "0.0.2",
-                  "from": "wordwrap@~0.0.2"
-                },
-                "minimist": {
-                  "version": "0.0.10",
-                  "from": "minimist@~0.0.1"
-                }
-              }
-            },
-            "sphericalmercator": {
-              "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.2"
-            }
-          }
-        },
-        "tilelive-mapnik": {
-          "version": "0.6.12",
-          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
-          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
-          "dependencies": {
-            "generic-pool": {
-              "version": "2.1.1",
-              "from": "generic-pool@~2.1.1"
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@~1.2.11"
-            },
-            "sphericalmercator": {
-              "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.2"
-            }
-          }
-        },
         "redis-mpool": {
           "version": "0.1.0",
           "from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0",
diff --git a/package.json b/package.json
index 6916a884..1edafb94 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.31.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/pgraster",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",

From 6325a23bb47ba91b465f798a55edd0266599f8b4 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 5 Nov 2014 12:48:26 +0100
Subject: [PATCH 02/22] Adds default value for raster overviews configuration

---
 config/environments/development.js.example | 1 +
 config/environments/production.js.example  | 1 +
 config/environments/staging.js.example     | 1 +
 config/environments/test.js.example        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 22a66806..376f2a5a 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -63,6 +63,7 @@ var config = {
         */
         row_limit: 65535,
         simplify_geometries: true,
+        use_overviews: true, // use overviews to retrieve raster
         /*
          * Set persist_connection to false if you want
          * database connections to be closed on renderer
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 2a47ea5b..08b96202 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -65,6 +65,7 @@ var config = {
          */
         persist_connection: false,
         simplify_geometries: true,
+        use_overviews: true, // use overviews to retrieve raster
         max_size: 500
     }
     ,mapnik_version: undefined
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 446d5c2f..c8bcb5b4 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -57,6 +57,7 @@ var config = {
         extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
         row_limit: 65535,
         simplify_geometries: true,
+        use_overviews: true, // use overviews to retrieve raster
         /*
          * Set persist_connection to false if you want
          * database connections to be closed on renderer
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 9fa7aca8..9d6fb502 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -57,6 +57,7 @@ var config = {
         extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
         row_limit: 65535,
         simplify_geometries: true,
+        use_overviews: true, // use overviews to retrieve raster
         /*
          * Set persist_connection to false if you want
          * database connections to be closed on renderer

From c636a820d50e3302436407398ceb3c4949524cf9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Thu, 13 Nov 2014 14:14:24 +0100
Subject: [PATCH 03/22] Fix named maps instantiation example

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

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 36c9f00c..86a72d69 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -76,11 +76,11 @@ The map config needs to be sent to CartoDB's Map API using an authenticated call
 curl 'https://{account}.cartodb.com/api/v1/map/named?api_key=APIKEY' -H 'Content-Type: application/json' -d @mapconfig.json
 {% endhighlight %}
 
-To get the `URL` to fetch the tiles you need to instantiate the map.
+To get the `URL` to fetch the tiles you need to instantiate the map, where `template_id` is the template name from the previous response.
 
 <div class="code-title notitle code-request"></div>
 {% highlight bash %}
-curl 'http://{account}.cartodb.com/api/v1/map/named/test' -H 'Content-Type: application/json'
+curl -X POST 'http://{account}.cartodb.com/api/v1/map/named/:template_id' -H 'Content-Type: application/json'
 {% endhighlight %}
 
 The response will return JSON with properties for the `layergroupid` and the timestamp (`last_updated`) of the last data modification. 

From 10b10819609c67f66de2d7af6a3f485724b231e5 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Fri, 14 Nov 2014 17:23:15 +0100
Subject: [PATCH 04/22] Change highlighting to ```

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

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 86a72d69..2032b1fa 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -16,7 +16,7 @@ You can create two types of maps with the Maps API:
 
 Here is an example of how to create an anonymous map with JavaScript:
 
-{% highlight javascript %}
+```javascript
 var mapconfig = {
   "version": "1.0.1",
   "layers": [{
@@ -41,14 +41,14 @@ $.ajax({
     console.log(templateUrl);
   }
 })
-{% endhighlight %}
+```
 
 ### Named maps
 
 Let's create a named map using some private tables in a CartoDB account.
 The following API call creates a map of European countries that have a white fill color:
 
-{% highlight javascript %}
+```javascript
 // mapconfig.json
 {
   "version": "0.0.1",
@@ -67,38 +67,38 @@ The following API call creates a map of European countries that have a white fil
     }]
   }
 }
-{% endhighlight %}
+```
 
 The map config needs to be sent to CartoDB's Map API using an authenticated call. Here we use a command line tool called `curl`. For more info about this tool see [this blog post](http://quickleft.com/blog/command-line-tutorials-curl) or type ``man curl`` in bash. Using `curl` the call would look like:
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 curl 'https://{account}.cartodb.com/api/v1/map/named?api_key=APIKEY' -H 'Content-Type: application/json' -d @mapconfig.json
-{% endhighlight %}
+```
 
 To get the `URL` to fetch the tiles you need to instantiate the map, where `template_id` is the template name from the previous response.
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 curl -X POST 'http://{account}.cartodb.com/api/v1/map/named/:template_id' -H 'Content-Type: application/json'
-{% endhighlight %}
+```
 
 The response will return JSON with properties for the `layergroupid` and the timestamp (`last_updated`) of the last data modification. 
 
 Here is an example response:
 
-{% highlight javascript %}
+```javascript
 {
   "layergroupid": "c01a54877c62831bb51720263f91fb33:0",
   "last_updated": "1970-01-01T00:00:00.000Z"
 }
-{% endhighlight %}
+```
 
 You can use the `layergroupid` to instantiate a URL template for accessing tiles on the client. Here we use the `layergroupid` from the example response above in this URL template:
 
-{% highlight bash %}
+```bash
 http://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/{z}/{x}/{y}.png
-{% endhighlight %}
+```
 
 ## General Concepts
 
@@ -114,13 +114,13 @@ To execute an authorized request, api_key=YOURAPIKEY should be added to the requ
 
 Errors are reported using standard HTTP codes and extended information encoded in JSON with this format:
 
-{% highlight javascript %}
+```javascript
 {
   "errors": [
     "access forbidden to table TABLE"
   ]
 }
-{% endhighlight %}
+```
 
 If you use JSONP, the 200 HTTP code is always returned so the JavaScript client can receive errors from the JSON object.
 
@@ -137,13 +137,13 @@ Anonymous maps allows you to instantiate a map given SQL and CartoCSS. It also a
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight html %}
+```html
 POST /api/v1/map
-{% endhighlight %}
+```
 
 #### Params
 
-{% highlight javascript %}
+```javascript
 {
   "version": "1.0.1",
   "layers": [{
@@ -156,7 +156,7 @@ POST /api/v1/map
     }
   }]
 }
-{% endhighlight %}
+```
 
 Should be a [Mapconfig](https://github.com/CartoDB/Windshaft/blob/0.19.1/doc/MapConfig-1.1.0.md).
 
@@ -167,9 +167,9 @@ The response includes:
 - **layergroupid**  
   The ID for that map, used to compose the URL for the tiles. The final URL is:
 
-  {% highlight html %}
+  ```html
   http://{account}.cartodb.com/api/v1/map/:layergroupid/{z}/{x}/{y}.png
-  {% endhighlight %}
+  ```
 
 - **updated_at**  
   The ISO date of the last time the data involved in the query was updated.
@@ -183,12 +183,12 @@ The response includes:
 #### Example
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl 'http://documentation.cartodb.com/api/v1/map' -H 'Content-Type: application/json' -d @mapconfig.json
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
   "layergroupid":"c01a54877c62831bb51720263f91fb33:0",
   "last_updated":"1970-01-01T00:00:00.000Z"
@@ -197,31 +197,31 @@ curl 'http://documentation.cartodb.com/api/v1/map' -H 'Content-Type: application
     "https": "https://cdb.com"
   }
 }
-{% endhighlight %}
+```
 
 The tiles can be accessed using:
 
-{% highlight bash %}
+```bash
 http://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/{z}/{x}/{y}.png
-{% endhighlight %}
+```
 
 For UTF grid tiles:
 
-{% highlight bash %}
+```bash
 http://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/{z}/{x}/{y}.grid.json
-{% endhighlight %}
+```
 
 For attributes defined in `attributes` section:
 
-{% highlight bash %}
+```bash
 http://documentation.cartodb.com/api/v1/map/c01a54877c62831bb51720263f91fb33:0/:layer/attributes/:feature_id
-{% endhighlight %}
+```
 
 Which returns JSON with the attributes defined, like:
 
-{% highlight javascript %}
+```javascript
 { c: 1, d: 2 }
-{% endhighlight %}
+```
 
 Notice UTF Grid and attributes endpoints need an intenger parameter, ``layer``. That number is the 0-based index of the layer inside the mapconfig. So 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.
 
@@ -232,9 +232,9 @@ The JSONP endpoint is provided in order to allow web browsers access which don't
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 GET /api/v1/map?callback=method
-{% endhighlight %}
+```
 
 #### Params
 
@@ -253,15 +253,15 @@ GET /api/v1/map?callback=method
 #### Example
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl http://...
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
 }
-{% endhighlight %}
+```
 
 ### Remove
 
@@ -286,14 +286,14 @@ Template maps are persistent with no preset expiration. They can only be created
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight html %}
+```html
 POST /api/v1/map/named
-{% endhighlight %}
+```
 
 #### Params
 
 <div class="code-title">template.json</div>
-{% highlight javascript %}
+```javascript
 {
   "version": "0.0.1",
   "name": "template_name",
@@ -328,7 +328,7 @@ POST /api/v1/map/named
     ]
   }
 }
-{% endhighlight %}
+```
 
 ##### Arguments
 
@@ -346,9 +346,9 @@ Valid placeholder names start with a letter and can only contain letters, number
 
 ##### Example
 
-{% highlight javascript %}
+```javascript
 <%= my_color %>
-{% endhighlight %}
+```
 
 The set of supported placeholders for a template will need to be explicitly defined with a specific type and default value for each.
 
@@ -366,19 +366,19 @@ Placeholder default values will be used whenever new values are not provided as
 When using templates, be very careful about your selections as they can give broad access to your data if they are defined losely.
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight html %}
+```html
 curl -X POST \
    -H 'Content-Type: application/json' \
    -d @template.json \
    'https://documentation.cartodb.com/api/v1/map/named?api_key=APIKEY'
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
   "templateid":"name",
 }
-{% endhighlight %}
+```
 
 ### Instantiate
 
@@ -387,19 +387,19 @@ Instantiating a map allows you to get the information needed to fetch tiles. Tha
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight html %}
+```html
 POST /api/v1/map/named/:template_name
-{% endhighlight %}
+```
 
 #### Param
 
-{% highlight javascript %}
+```javascript
 // params.json
 {
  color: "#ff0000",
  cartodb_id: 3
 }
-{% endhighlight %}
+```
 
 The fields you pass as `params.json` depend on the variables allowed by the named map. If there are variables missing it will raise an error (HTTP 400)
 
@@ -412,27 +412,27 @@ You can initialize a template map by passing all of the required parameters in a
 Valid credentials will be needed if required by the template.
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl -X POST \
   -H 'Content-Type: application/json' \
   -d @params.json \
   'https://documentation.cartodb.com/api/v1/map/named/@template_name?auth_token=AUTH_TOKEN'
-{% endhighlight %}
+```
 
 <div class="code-title">Response</div>
-{% highlight javascript %}
+```javascript
 {
   "layergroupid": "docs@fd2861af@c01a54877c62831bb51720263f91fb33:123456788",
   "last_updated": "2013-11-14T11:20:15.000Z"
 }
-{% endhighlight %}
+```
 
 <div class="code-title">Error</div>
-{% highlight javascript %}
+```javascript
 {
   "error": "Some error string here"
 }
-{% endhighlight %}
+```
 
 You can then use the `layergroupid` for fetching tiles and grids as you would normally (see anonymous map section).  However, you'll need to show the `auth_token`, if required by the template.
 
@@ -443,9 +443,9 @@ There is also a special endpoint to be able to initialize a map using JSONP (for
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 GET /api/v1/map/named/:template_name/jsonp
-{% endhighlight %}
+```
 
 #### Params
 
@@ -455,12 +455,12 @@ GET /api/v1/map/named/:template_name/jsonp
 - **callback:** JSON callback name
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl 'https://documentation.cartodb.com/api/v1/map/named/:template_name/jsonp?auth_token=AUTH_TOKEN&callback=callback&config=template_params_json'
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 callback({
   "layergroupid":"c01a54877c62831bb51720263f91fb33:0",
   "last_updated":"1970-01-01T00:00:00.000Z"
@@ -469,32 +469,32 @@ callback({
     "https": "https://cdb.com"
   }
 })
-{% endhighlight %}
+```
 
 This takes the `callback` function (required), `auth_token` if the template needs auth, and `config` which is the variable for the template (in cases where it has variables). 
 
-{% highlight javascript %}
+```javascript
 url += "config=" + encodeURIComponent(
 JSON.stringify({ color: 'red' });
-{% endhighlight %}
+```
 
 The response is in this format:
 
-{% highlight javascript %}
+```javascript
 callback({
   layergroupid: "dev@744bd0ed9b047f953fae673d56a47b4d:1390844463021.1401",
   last_updated: "2014-01-27T17:41:03.021Z"
 })
-{% endhighlight %}
+```
 
 ### Update
 
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 PUT /api/v1/map/named/:template_name
-{% endhighlight %}
+```
 
 #### Params
 
@@ -511,29 +511,29 @@ Updating a named map removes all the named map instances so they need to be init
 #### Example
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl -X PUT \
   -H 'Content-Type: application/json' \
   -d @template.json \
   'https://documentation.cartodb.com/api/v1/map/named/:template_name?api_key=APIKEY'
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
   "template_id": "@template_name"
 }
-{% endhighlight %}
+```
 
 If any template has the same name, it will be updated.
 
 If a template with the same name does NOT exist, a 400 HTTP response is generated with an error in this format:
 
-{% highlight javascript %}
+```javascript
 {
   "error": "error string here"
 }
-{% endhighlight %}
+```
 
 Updating a template map will also remove all signatures from previously initialized maps. 
 
@@ -544,23 +544,23 @@ Delete the specified template map from the server and disables any previously in
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 DELETE /api/v1/map/named/:template_name
-{% endhighlight %}
+```
 
 #### Example
 
 <div class="code-title code-request">REQUEST</div>
-{% highlight bash %}
+```bash
 curl -X DELETE 'https://documentation.cartodb.com/api/v1/map/named/:template_name?auth_token=AUTH_TOKEN'
-{% endhighlight %}
+```
 
 <div class="code-title">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
   "error": "Some error string here"
 }
-{% endhighlight %}
+```
 
 On success, a 204 (No Content) response would be issued. Otherwise a 4xx response with with an error will be returned:
 
@@ -571,9 +571,9 @@ This allows you to get a list of all available templates.
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 GET /api/v1/map/named/
-{% endhighlight %}
+```
 
 #### Params
 
@@ -582,23 +582,23 @@ GET /api/v1/map/named/
 #### Example
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl -X GET 'https://documentation.cartodb.com/api/v1/map/named?api_key=APIKEY'
-{% endhighlight %}
+```
 
 <div class="code-title with-result">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
    "template_ids": ["@template_name1","@template_name2"]
 }
-{% endhighlight %}
+```
 
 <div class="code-title">ERROR</div>
-{% highlight javascript %}
+```javascript
 {
    "error": "Some error string here"
 }
-{% endhighlight %}
+```
 
 ### Getting a Specific Template
 
@@ -607,9 +607,9 @@ This gets the definition of a template
 #### Definition
 
 <div class="code-title notitle code-request"></div>
-{% highlight bash %}
+```bash
 GET /api/v1/map/named/:template_name
-{% endhighlight %}
+```
 
 #### Params
 
@@ -618,20 +618,20 @@ GET /api/v1/map/named/:template_name
 #### Example
 
 <div class="code-title code-request with-result">REQUEST</div>
-{% highlight bash %}
+```bash
 curl -X GET 'https://documentation.cartodb.com/api/v1/map/named/:template_name?auth_token=AUTH_TOKEN'
-{% endhighlight %}
+```
 
 <div class="code-title with-result">RESPONSE</div>
-{% highlight javascript %}
+```javascript
 {
   "template": {...} // see template.json above
 }
-{% endhighlight %}
+```
 
 <div class="code-title">ERROR</div>
-{% highlight javascript %}
+```javascript
 {
   "error": "Some error string here"
 }
-{% endhighlight %}
+```

From 2089a299f10a4e3b7af96e1315db7c41ff776126 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Tue, 18 Nov 2014 11:33:33 +0100
Subject: [PATCH 05/22] Fix json

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

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 2032b1fa..8a674dc2 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -396,8 +396,8 @@ POST /api/v1/map/named/:template_name
 ```javascript
 // params.json
 {
- color: "#ff0000",
- cartodb_id: 3
+ "color": "#ff0000",
+ "cartodb_id": 3
 }
 ```
 

From 4bad92e3dd665d84ddd4126a817af33d1f2414e8 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Fri, 21 Nov 2014 15:19:41 +0100
Subject: [PATCH 06/22] Improve named maps

---
 docs/Map-API.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 8a674dc2..23b9b8e0 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -267,6 +267,7 @@ curl http://...
 
 Anonymous maps cannot be removed by an API call. They will expire after about five minutes but sometimes longer. If an anonymous map expires and tiles are requested from it, an error will be raised. This could happen if a user leaves a map open and after time returns to the map an attempts to interact with it in a way that requires new tiles (e.g. zoom). The client will need to go through the steps of creating the map again to fix the problem.
 
+
 ## Named Maps
 
 Named maps are essentially the same as anonymous maps but the mapconfig is stored in the server and given a unique name. Two other big differences are that you can created named maps from private data and that users without an API Key can see them even though they are from that private data. 
@@ -292,6 +293,8 @@ POST /api/v1/map/named
 
 #### Params
 
+- **api_key** is required
+
 <div class="code-title">template.json</div>
 ```javascript
 {
@@ -335,6 +338,7 @@ POST /api/v1/map/named
 - **name**: there can be at most 1 template with the same name for any user valid names start with a letter and only contains letter, numbers or underscores
 - **auth**:
   - **method** `"token"` or `"open"` (the default if no `"method"` is given)
+  - **valid_tokens** when `"method"` is set to `"token"` these tokens will allow to instantiate the named map
 - **placeholders**: Variables not listed here are not substituted. Variable not provided at instantiation time trigger an error. A default is required for optional variables. Type specification is used for quoting, to avoid injections see template format section below.
 - **layergroup**: the layer list definition. This is the MapConfig explained in anonymous maps see https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.1.0.md
 
@@ -393,6 +397,8 @@ POST /api/v1/map/named/:template_name
 
 #### Param
 
+- **auth_token** optional, but required when when `"method"` is set to `"token"`
+
 ```javascript
 // params.json
 {
@@ -449,7 +455,7 @@ GET /api/v1/map/named/:template_name/jsonp
 
 #### Params
 
-- **auth_token** *(optional)* If the named map needs auth
+- **auth_token** optional, but required when when `"method"` is set to `"token"`
 - **config** Encoded JSON with the params for creating named maps (the variables defined in the template)
 - **lmza** This attribute contains the same as config but LZMA compressed. It cannot be used at the same time than `config`.
 - **callback:** JSON callback name
@@ -498,7 +504,7 @@ PUT /api/v1/map/named/:template_name
 
 #### Params
 
-Same params used to create a map.
+- **api_key** is required
 
 #### Response
 
@@ -548,11 +554,15 @@ Delete the specified template map from the server and disables any previously in
 DELETE /api/v1/map/named/:template_name
 ```
 
+#### Params
+
+- **api_key** is required
+
 #### Example
 
 <div class="code-title code-request">REQUEST</div>
 ```bash
-curl -X DELETE 'https://documentation.cartodb.com/api/v1/map/named/:template_name?auth_token=AUTH_TOKEN'
+curl -X DELETE 'https://documentation.cartodb.com/api/v1/map/named/:template_name?api_key=APIKEY'
 ```
 
 <div class="code-title">RESPONSE</div>
@@ -562,7 +572,7 @@ curl -X DELETE 'https://documentation.cartodb.com/api/v1/map/named/:template_nam
 }
 ```
 
-On success, a 204 (No Content) response would be issued. Otherwise a 4xx response with with an error will be returned:
+On success, a 204 (No Content) response would be issued. Otherwise a 4xx response with with an error will be returned.
 
 ### Listing Available Templates
 
@@ -619,7 +629,7 @@ GET /api/v1/map/named/:template_name
 
 <div class="code-title code-request with-result">REQUEST</div>
 ```bash
-curl -X GET 'https://documentation.cartodb.com/api/v1/map/named/:template_name?auth_token=AUTH_TOKEN'
+curl -X GET 'https://documentation.cartodb.com/api/v1/map/named/:template_name?api_key=APIKEY'
 ```
 
 <div class="code-title with-result">RESPONSE</div>

From bf970803ec09aa53db4c4568d2da17e4c50e224e Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 25 Nov 2014 13:19:04 +0100
Subject: [PATCH 07/22] Defaults logging to stdout in development config
 example

---
 config/environments/development.js.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 630b7091..86aea6ce 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -40,7 +40,7 @@ var config = {
     // If log_filename is given logs will be written
     // there, in append mode. Otherwise stdout is used (default).
     // Log file will be re-opened on receiving the HUP signal
-    ,log_filename: 'logs/node-windshaft.log'
+    ,log_filename: undefined
     // Templated database username for authorized user
     // Supported labels: 'user_id' (read from redis)
     ,postgres_auth_user: 'development_cartodb_user_<%= user_id %>'

From 5905971178d1c6bdd8f0e927b4b421b9542942e8 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Tue, 25 Nov 2014 14:39:18 +0100
Subject: [PATCH 08/22] Fix url for stats wiki

---
 docs/MultiLayer-API.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/MultiLayer-API.md b/docs/MultiLayer-API.md
index 7b5f064e..740d56f1 100644
--- a/docs/MultiLayer-API.md
+++ b/docs/MultiLayer-API.md
@@ -25,4 +25,4 @@ Windshaft-CartoDB adds the following attributes in the response object
 
 ## Stats tag
 
-Windshaft-CartoDB adds support for a ``stat_tag`` element in the multilayer configuration to help [stats](Redis-stats-format) gathering.
+Windshaft-CartoDB adds support for a ``stat_tag`` element in the multilayer configuration to help [stats](https://github.com/CartoDB/Windshaft-cartodb/wiki/Redis-stats-format) gathering.

From 2711c9b78cb3b368d3b76ddbb3a4638262cef17c Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoa@cartodb.com>
Date: Tue, 2 Dec 2014 11:00:36 +0100
Subject: [PATCH 09/22] Fix typo

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

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 23b9b8e0..fb2a8066 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -397,7 +397,7 @@ POST /api/v1/map/named/:template_name
 
 #### Param
 
-- **auth_token** optional, but required when when `"method"` is set to `"token"`
+- **auth_token** optional, but required when `"method"` is set to `"token"`
 
 ```javascript
 // params.json
@@ -455,7 +455,7 @@ GET /api/v1/map/named/:template_name/jsonp
 
 #### Params
 
-- **auth_token** optional, but required when when `"method"` is set to `"token"`
+- **auth_token** optional, but required when `"method"` is set to `"token"`
 - **config** Encoded JSON with the params for creating named maps (the variables defined in the template)
 - **lmza** This attribute contains the same as config but LZMA compressed. It cannot be used at the same time than `config`.
 - **callback:** JSON callback name

From 3b4b5ab2980f9d7286bed73819a0f17bf9846266 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 2 Dec 2014 15:05:28 +0100
Subject: [PATCH 10/22] Closes fd for log files on `kill -HUP`. Fixes #230

---
 NEWS.md             |    3 +
 app.js              |    7 +-
 npm-shrinkwrap.json | 1916 ++++++++++++++++++++++---------------------
 package.json        |    2 +-
 4 files changed, 999 insertions(+), 929 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 69257515..d6bef7d2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 Announcements:
  - Upgrades windshaft to 0.32.0
 
+Bugfixes:
+ - Closes fd for log files on `kill -HUP` (#230)
+
 
 1.21.0 -- 2014-10-24
 --------------------
diff --git a/app.js b/app.js
index d60bdfd3..61d3dfad 100755
--- a/app.js
+++ b/app.js
@@ -116,8 +116,11 @@ process.on('SIGUSR2', function() {
 });
 
 process.on('SIGHUP', function() {
-  log4js.configure(log4js_config);
-  console.log('Log files reloaded');
+    global.log4js.clearAndShutdownAppenders(function() {
+        global.log4js.configure(log4js_config);
+        global.logger = log4js.getLogger();
+        console.log('Log files reloaded');
+    });
 });
 
 process.on('uncaughtException', function(err) {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0303b8fb..d2646362 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -67,8 +67,8 @@
     },
     "log4js": {
       "version": "0.6.21",
-      "from": "log4js@~0.6.17",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.21.tgz",
+      "from": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+      "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb",
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -86,7 +86,8 @@
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@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",
@@ -199,11 +200,13 @@
                 },
                 "mapnik-reference": {
                   "version": "5.0.9",
-                  "from": "mapnik-reference@~5.0.7"
+                  "from": "mapnik-reference@~5.0.7",
+                  "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
                 },
                 "xml2js": {
                   "version": "0.2.8",
                   "from": "xml2js@~0.2.4",
+                  "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.8",
@@ -214,6 +217,7 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -228,856 +232,28 @@
               }
             },
             "millstone": {
-              "version": "0.6.14",
+              "version": "0.6.15",
               "from": "millstone@~0.6.14",
+              "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.15.tgz",
               "dependencies": {
                 "generic-pool": {
-                  "version": "2.0.4",
-                  "from": "generic-pool@~2.0.3"
-                },
-                "request": {
-                  "version": "2.34.0",
-                  "from": "request@~2.34.0",
-                  "dependencies": {
-                    "qs": {
-                      "version": "0.6.6",
-                      "from": "qs@~0.6.0"
-                    },
-                    "json-stringify-safe": {
-                      "version": "5.0.0",
-                      "from": "json-stringify-safe@~5.0.0"
-                    },
-                    "forever-agent": {
-                      "version": "0.5.2",
-                      "from": "forever-agent@~0.5.0"
-                    },
-                    "node-uuid": {
-                      "version": "1.4.1",
-                      "from": "node-uuid@~1.4.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-                    },
-                    "tough-cookie": {
-                      "version": "0.12.1",
-                      "from": "tough-cookie@>=0.12.0",
-                      "dependencies": {
-                        "punycode": {
-                          "version": "1.3.2",
-                          "from": "punycode@>=0.2.0",
-                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
-                        }
-                      }
-                    },
-                    "form-data": {
-                      "version": "0.1.4",
-                      "from": "form-data@~0.1.0",
-                      "dependencies": {
-                        "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"
-                            }
-                          }
-                        },
-                        "async": {
-                          "version": "0.9.0",
-                          "from": "async@~0.9.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
-                        }
-                      }
-                    },
-                    "tunnel-agent": {
-                      "version": "0.3.0",
-                      "from": "tunnel-agent@~0.3.0"
-                    },
-                    "http-signature": {
-                      "version": "0.10.0",
-                      "from": "http-signature@~0.10.0",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "0.1.2",
-                          "from": "assert-plus@0.1.2"
-                        },
-                        "asn1": {
-                          "version": "0.1.11",
-                          "from": "asn1@0.1.11"
-                        },
-                        "ctype": {
-                          "version": "0.5.2",
-                          "from": "ctype@0.5.2"
-                        }
-                      }
-                    },
-                    "oauth-sign": {
-                      "version": "0.3.0",
-                      "from": "oauth-sign@~0.3.0"
-                    },
-                    "hawk": {
-                      "version": "1.0.0",
-                      "from": "hawk@~1.0.0",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "0.9.1",
-                          "from": "hoek@0.9.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                        },
-                        "boom": {
-                          "version": "0.4.2",
-                          "from": "boom@0.4.x"
-                        },
-                        "cryptiles": {
-                          "version": "0.2.2",
-                          "from": "cryptiles@0.2.x"
-                        },
-                        "sntp": {
-                          "version": "0.2.4",
-                          "from": "sntp@0.2.x"
-                        }
-                      }
-                    },
-                    "aws-sign2": {
-                      "version": "0.5.0",
-                      "from": "aws-sign2@~0.5.0"
-                    }
-                  }
+                  "version": "2.1.1",
+                  "from": "generic-pool@~2.1.1"
                 },
                 "srs": {
-                  "version": "0.4.3",
-                  "from": "srs@~0.4.1",
+                  "version": "0.4.6",
+                  "from": "srs@~0.4.6",
+                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz",
                   "dependencies": {
                     "nan": {
-                      "version": "1.2.0",
-                      "from": "nan@~1.2.0"
+                      "version": "1.4.1",
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
                     "node-pre-gyp": {
-                      "version": "0.5.17",
-                      "from": "node-pre-gyp@0.5.x",
-                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.17.tgz",
-                      "dependencies": {
-                        "nopt": {
-                          "version": "2.2.1",
-                          "from": "nopt@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
-                          "dependencies": {
-                            "abbrev": {
-                              "version": "1.0.5",
-                              "from": "abbrev@1",
-                              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
-                            }
-                          }
-                        },
-                        "npmlog": {
-                          "version": "0.0.6",
-                          "from": "npmlog@~0.0.6",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz",
-                          "dependencies": {
-                            "ansi": {
-                              "version": "0.2.1",
-                              "from": "ansi@~0.2.1",
-                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"
-                            }
-                          }
-                        },
-                        "request": {
-                          "version": "2.36.0",
-                          "from": "request@2",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
-                          "dependencies": {
-                            "qs": {
-                              "version": "0.6.6",
-                              "from": "qs@~0.6.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
-                            },
-                            "json-stringify-safe": {
-                              "version": "5.0.0",
-                              "from": "json-stringify-safe@~5.0.0",
-                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                            },
-                            "mime": {
-                              "version": "1.2.11",
-                              "from": "mime@~1.2.9",
-                              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                            },
-                            "forever-agent": {
-                              "version": "0.5.2",
-                              "from": "forever-agent@~0.5.0",
-                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                            },
-                            "node-uuid": {
-                              "version": "1.4.1",
-                              "from": "node-uuid@~1.4.0",
-                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-                            },
-                            "tough-cookie": {
-                              "version": "0.12.1",
-                              "from": "tough-cookie@>=0.12.0",
-                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-                              "dependencies": {
-                                "punycode": {
-                                  "version": "1.2.4",
-                                  "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
-                                }
-                              }
-                            },
-                            "form-data": {
-                              "version": "0.1.2",
-                              "from": "form-data@~0.1.0",
-                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz",
-                              "dependencies": {
-                                "combined-stream": {
-                                  "version": "0.0.4",
-                                  "from": "combined-stream@~0.0.4",
-                                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.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"
-                                    }
-                                  }
-                                },
-                                "async": {
-                                  "version": "0.2.10",
-                                  "from": "async@~0.2.9",
-                                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                                }
-                              }
-                            },
-                            "tunnel-agent": {
-                              "version": "0.4.0",
-                              "from": "tunnel-agent@~0.4.0",
-                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-                            },
-                            "http-signature": {
-                              "version": "0.10.0",
-                              "from": "http-signature@~0.10.0",
-                              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
-                              "dependencies": {
-                                "assert-plus": {
-                                  "version": "0.1.2",
-                                  "from": "assert-plus@0.1.2",
-                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
-                                },
-                                "asn1": {
-                                  "version": "0.1.11",
-                                  "from": "asn1@0.1.11",
-                                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                                },
-                                "ctype": {
-                                  "version": "0.5.2",
-                                  "from": "ctype@0.5.2",
-                                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
-                                }
-                              }
-                            },
-                            "oauth-sign": {
-                              "version": "0.3.0",
-                              "from": "oauth-sign@~0.3.0",
-                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
-                            },
-                            "hawk": {
-                              "version": "1.0.0",
-                              "from": "hawk@~1.0.0",
-                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-                              "dependencies": {
-                                "hoek": {
-                                  "version": "0.9.1",
-                                  "from": "hoek@0.9.x",
-                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                                },
-                                "boom": {
-                                  "version": "0.4.2",
-                                  "from": "boom@0.4.x",
-                                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                                },
-                                "cryptiles": {
-                                  "version": "0.2.2",
-                                  "from": "cryptiles@0.2.x",
-                                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                                },
-                                "sntp": {
-                                  "version": "0.2.4",
-                                  "from": "sntp@0.2.x",
-                                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                                }
-                              }
-                            },
-                            "aws-sign2": {
-                              "version": "0.5.0",
-                              "from": "aws-sign2@~0.5.0",
-                              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                            }
-                          }
-                        },
-                        "semver": {
-                          "version": "2.3.0",
-                          "from": "semver@~2.3.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz"
-                        },
-                        "tar": {
-                          "version": "0.1.19",
-                          "from": "tar@~0.1.19",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz",
-                          "dependencies": {
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
-                            "block-stream": {
-                              "version": "0.0.7",
-                              "from": "block-stream@*",
-                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
-                            },
-                            "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.8",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
-                              "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
-                                "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "tar-pack": {
-                          "version": "2.0.0",
-                          "from": "tar-pack@~2.0.0",
-                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
-                          "dependencies": {
-                            "uid-number": {
-                              "version": "0.0.3",
-                              "from": "uid-number@0.0.3",
-                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
-                            },
-                            "once": {
-                              "version": "1.1.1",
-                              "from": "once@~1.1.1",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
-                            },
-                            "debug": {
-                              "version": "0.7.4",
-                              "from": "debug@~0.7.2",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-                            },
-                            "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.22",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
-                              "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
-                                "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "fstream-ignore": {
-                              "version": "0.0.7",
-                              "from": "fstream-ignore@0.0.7",
-                              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
-                              "dependencies": {
-                                "minimatch": {
-                                  "version": "0.2.14",
-                                  "from": "minimatch@~0.2.0",
-                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                                  "dependencies": {
-                                    "lru-cache": {
-                                      "version": "2.5.0",
-                                      "from": "lru-cache@2",
-                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                                    },
-                                    "sigmund": {
-                                      "version": "1.0.0",
-                                      "from": "sigmund@~1.0.0",
-                                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "readable-stream": {
-                              "version": "1.0.27-1",
-                              "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.1",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.25-1",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "graceful-fs": {
-                              "version": "1.2.3",
-                              "from": "graceful-fs@1.2",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                            }
-                          }
-                        },
-                        "mkdirp": {
-                          "version": "0.5.0",
-                          "from": "mkdirp@~0.5.0",
-                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "0.0.8",
-                              "from": "minimist@0.0.8",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                            }
-                          }
-                        },
-                        "rc": {
-                          "version": "0.4.0",
-                          "from": "rc@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "0.0.10",
-                              "from": "minimist@~0.0.7",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                            },
-                            "deep-extend": {
-                              "version": "0.2.10",
-                              "from": "deep-extend@~0.2.5",
-                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz"
-                            },
-                            "strip-json-comments": {
-                              "version": "0.1.3",
-                              "from": "strip-json-comments@0.1.x",
-                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                            },
-                            "ini": {
-                              "version": "1.1.0",
-                              "from": "ini@~1.1.0",
-                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "rimraf": {
-                          "version": "2.2.8",
-                          "from": "rimraf@~2.2.5",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "zipfile": {
-                  "version": "0.5.3",
-                  "from": "zipfile@~0.5.2",
-                  "dependencies": {
-                    "nan": {
-                      "version": "1.2.0",
-                      "from": "nan@~1.2.0"
-                    },
-                    "node-pre-gyp": {
-                      "version": "0.5.19",
-                      "from": "node-pre-gyp@0.5.x",
-                      "dependencies": {
-                        "nopt": {
-                          "version": "2.2.1",
-                          "from": "nopt@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
-                          "dependencies": {
-                            "abbrev": {
-                              "version": "1.0.5",
-                              "from": "abbrev@1",
-                              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
-                            }
-                          }
-                        },
-                        "npmlog": {
-                          "version": "0.0.6",
-                          "from": "npmlog@~0.0.6",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz",
-                          "dependencies": {
-                            "ansi": {
-                              "version": "0.2.1",
-                              "from": "ansi@~0.2.1",
-                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"
-                            }
-                          }
-                        },
-                        "request": {
-                          "version": "2.36.0",
-                          "from": "request@2",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
-                          "dependencies": {
-                            "qs": {
-                              "version": "0.6.6",
-                              "from": "qs@~0.6.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
-                            },
-                            "json-stringify-safe": {
-                              "version": "5.0.0",
-                              "from": "json-stringify-safe@~5.0.0",
-                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                            },
-                            "mime": {
-                              "version": "1.2.11",
-                              "from": "mime@~1.2.9",
-                              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
-                            },
-                            "forever-agent": {
-                              "version": "0.5.2",
-                              "from": "forever-agent@~0.5.0",
-                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-                            },
-                            "node-uuid": {
-                              "version": "1.4.1",
-                              "from": "node-uuid@~1.4.0",
-                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-                            },
-                            "tough-cookie": {
-                              "version": "0.12.1",
-                              "from": "tough-cookie@>=0.12.0",
-                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-                              "dependencies": {
-                                "punycode": {
-                                  "version": "1.2.4",
-                                  "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
-                                }
-                              }
-                            },
-                            "form-data": {
-                              "version": "0.1.2",
-                              "from": "form-data@~0.1.0",
-                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz",
-                              "dependencies": {
-                                "combined-stream": {
-                                  "version": "0.0.4",
-                                  "from": "combined-stream@~0.0.4",
-                                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.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"
-                                    }
-                                  }
-                                },
-                                "async": {
-                                  "version": "0.2.10",
-                                  "from": "async@~0.2.9",
-                                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                                }
-                              }
-                            },
-                            "tunnel-agent": {
-                              "version": "0.4.0",
-                              "from": "tunnel-agent@~0.4.0",
-                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-                            },
-                            "http-signature": {
-                              "version": "0.10.0",
-                              "from": "http-signature@~0.10.0",
-                              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
-                              "dependencies": {
-                                "assert-plus": {
-                                  "version": "0.1.2",
-                                  "from": "assert-plus@0.1.2",
-                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
-                                },
-                                "asn1": {
-                                  "version": "0.1.11",
-                                  "from": "asn1@0.1.11",
-                                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-                                },
-                                "ctype": {
-                                  "version": "0.5.2",
-                                  "from": "ctype@0.5.2",
-                                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
-                                }
-                              }
-                            },
-                            "oauth-sign": {
-                              "version": "0.3.0",
-                              "from": "oauth-sign@~0.3.0",
-                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
-                            },
-                            "hawk": {
-                              "version": "1.0.0",
-                              "from": "hawk@~1.0.0",
-                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-                              "dependencies": {
-                                "hoek": {
-                                  "version": "0.9.1",
-                                  "from": "hoek@0.9.x",
-                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                                },
-                                "boom": {
-                                  "version": "0.4.2",
-                                  "from": "boom@0.4.x",
-                                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-                                },
-                                "cryptiles": {
-                                  "version": "0.2.2",
-                                  "from": "cryptiles@0.2.x",
-                                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
-                                },
-                                "sntp": {
-                                  "version": "0.2.4",
-                                  "from": "sntp@0.2.x",
-                                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
-                                }
-                              }
-                            },
-                            "aws-sign2": {
-                              "version": "0.5.0",
-                              "from": "aws-sign2@~0.5.0",
-                              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-                            }
-                          }
-                        },
-                        "semver": {
-                          "version": "2.3.0",
-                          "from": "semver@~2.3.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz"
-                        },
-                        "tar": {
-                          "version": "0.1.19",
-                          "from": "tar@~0.1.19",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz",
-                          "dependencies": {
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
-                            "block-stream": {
-                              "version": "0.0.7",
-                              "from": "block-stream@*",
-                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
-                            },
-                            "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.8",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
-                              "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
-                                "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "tar-pack": {
-                          "version": "2.0.0",
-                          "from": "tar-pack@~2.0.0",
-                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
-                          "dependencies": {
-                            "uid-number": {
-                              "version": "0.0.3",
-                              "from": "uid-number@0.0.3",
-                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
-                            },
-                            "once": {
-                              "version": "1.1.1",
-                              "from": "once@~1.1.1",
-                              "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
-                            },
-                            "debug": {
-                              "version": "0.7.4",
-                              "from": "debug@~0.7.2",
-                              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
-                            },
-                            "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.22",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
-                              "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
-                                "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "fstream-ignore": {
-                              "version": "0.0.7",
-                              "from": "fstream-ignore@0.0.7",
-                              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
-                              "dependencies": {
-                                "minimatch": {
-                                  "version": "0.2.14",
-                                  "from": "minimatch@~0.2.0",
-                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-                                  "dependencies": {
-                                    "lru-cache": {
-                                      "version": "2.5.0",
-                                      "from": "lru-cache@2",
-                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
-                                    },
-                                    "sigmund": {
-                                      "version": "1.0.0",
-                                      "from": "sigmund@~1.0.0",
-                                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
-                                    }
-                                  }
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "readable-stream": {
-                              "version": "1.0.27-1",
-                              "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
-                              "dependencies": {
-                                "core-util-is": {
-                                  "version": "1.0.1",
-                                  "from": "core-util-is@~1.0.0",
-                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
-                                },
-                                "isarray": {
-                                  "version": "0.0.1",
-                                  "from": "isarray@0.0.1",
-                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-                                },
-                                "string_decoder": {
-                                  "version": "0.10.25-1",
-                                  "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
-                                },
-                                "inherits": {
-                                  "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                                }
-                              }
-                            },
-                            "graceful-fs": {
-                              "version": "1.2.3",
-                              "from": "graceful-fs@1.2",
-                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-                            }
-                          }
-                        },
-                        "mkdirp": {
-                          "version": "0.5.0",
-                          "from": "mkdirp@~0.5.0",
-                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "0.0.8",
-                              "from": "minimist@0.0.8",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                            }
-                          }
-                        },
-                        "rc": {
-                          "version": "0.4.0",
-                          "from": "rc@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz",
-                          "dependencies": {
-                            "minimist": {
-                              "version": "0.0.10",
-                              "from": "minimist@~0.0.7",
-                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-                            },
-                            "deep-extend": {
-                              "version": "0.2.10",
-                              "from": "deep-extend@~0.2.5",
-                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz"
-                            },
-                            "strip-json-comments": {
-                              "version": "0.1.3",
-                              "from": "strip-json-comments@0.1.x",
-                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
-                            },
-                            "ini": {
-                              "version": "1.1.0",
-                              "from": "ini@~1.1.0",
-                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
-                            }
-                          }
-                        },
-                        "rimraf": {
-                          "version": "2.2.8",
-                          "from": "rimraf@~2.2.5",
-                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "sqlite3": {
-                  "version": "2.2.7",
-                  "from": "sqlite3@2.x",
-                  "dependencies": {
-                    "nan": {
-                      "version": "1.1.2",
-                      "from": "nan@1.1.2",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
-                    },
-                    "node-pre-gyp": {
-                      "version": "0.5.22",
-                      "from": "node-pre-gyp@0.5.22",
-                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.22.tgz",
+                      "version": "0.6.1",
+                      "from": "node-pre-gyp@~0.6.1",
+                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.1.tgz",
                       "dependencies": {
                         "nopt": {
                           "version": "3.0.1",
@@ -1104,64 +280,59 @@
                           }
                         },
                         "request": {
-                          "version": "2.39.0",
+                          "version": "2.48.0",
                           "from": "request@2.x",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.39.0.tgz",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
                           "dependencies": {
-                            "qs": {
-                              "version": "0.6.6",
-                              "from": "qs@~0.6.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+                            "bl": {
+                              "version": "0.9.3",
+                              "from": "bl@~0.9.0",
+                              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@~1.0.26",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "0.0.1",
+                                      "from": "isarray@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@~0.10.x",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@~2.0.1",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
                             },
-                            "json-stringify-safe": {
-                              "version": "5.0.0",
-                              "from": "json-stringify-safe@~5.0.0",
-                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                            },
-                            "mime-types": {
-                              "version": "1.0.2",
-                              "from": "mime-types@~1.0.1",
-                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            "caseless": {
+                              "version": "0.7.0",
+                              "from": "caseless@~0.7.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
                             },
                             "forever-agent": {
                               "version": "0.5.2",
                               "from": "forever-agent@~0.5.0",
                               "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
                             },
-                            "node-uuid": {
-                              "version": "1.4.1",
-                              "from": "node-uuid@~1.4.0",
-                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
-                            },
-                            "tough-cookie": {
-                              "version": "0.12.1",
-                              "from": "tough-cookie@>=0.12.0",
-                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
-                              "dependencies": {
-                                "punycode": {
-                                  "version": "1.3.0",
-                                  "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
-                                }
-                              }
-                            },
                             "form-data": {
                               "version": "0.1.4",
                               "from": "form-data@~0.1.0",
                               "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
                               "dependencies": {
-                                "combined-stream": {
-                                  "version": "0.0.5",
-                                  "from": "combined-stream@~0.0.4",
-                                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
-                                  "dependencies": {
-                                    "delayed-stream": {
-                                      "version": "0.0.5",
-                                      "from": "delayed-stream@0.0.5",
-                                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
-                                    }
-                                  }
-                                },
                                 "mime": {
                                   "version": "1.2.11",
                                   "from": "mime@~1.2.11",
@@ -1174,11 +345,43 @@
                                 }
                               }
                             },
+                            "json-stringify-safe": {
+                              "version": "5.0.0",
+                              "from": "json-stringify-safe@~5.0.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                            },
+                            "mime-types": {
+                              "version": "1.0.2",
+                              "from": "mime-types@~1.0.1",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            },
+                            "node-uuid": {
+                              "version": "1.4.1",
+                              "from": "node-uuid@~1.4.0",
+                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+                            },
+                            "qs": {
+                              "version": "2.3.3",
+                              "from": "qs@~2.3.1",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                            },
                             "tunnel-agent": {
                               "version": "0.4.0",
                               "from": "tunnel-agent@~0.4.0",
                               "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
                             },
+                            "tough-cookie": {
+                              "version": "0.12.1",
+                              "from": "tough-cookie@>=0.12.0",
+                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                              "dependencies": {
+                                "punycode": {
+                                  "version": "1.3.2",
+                                  "from": "punycode@>=0.2.0",
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                                }
+                              }
+                            },
                             "http-signature": {
                               "version": "0.10.0",
                               "from": "http-signature@~0.10.0",
@@ -1202,9 +405,9 @@
                               }
                             },
                             "oauth-sign": {
-                              "version": "0.3.0",
-                              "from": "oauth-sign@~0.3.0",
-                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+                              "version": "0.5.0",
+                              "from": "oauth-sign@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
                             },
                             "hawk": {
                               "version": "1.1.1",
@@ -1242,18 +445,30 @@
                               "version": "0.0.4",
                               "from": "stringstream@~0.0.4",
                               "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",
+                              "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"
+                                }
+                              }
                             }
                           }
                         },
                         "semver": {
-                          "version": "3.0.1",
-                          "from": "semver@~3.0.1",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
+                          "version": "4.1.0",
+                          "from": "semver@~4.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
                         },
                         "tar": {
-                          "version": "1.0.0",
-                          "from": "tar@~1.0.0",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.0.tgz",
+                          "version": "1.0.2",
+                          "from": "tar@~1.0.2",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
                           "dependencies": {
                             "block-stream": {
                               "version": "0.0.7",
@@ -1261,20 +476,20 @@
                               "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
                             },
                             "fstream": {
-                              "version": "1.0.1",
-                              "from": "fstream@^1.0.0",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.1.tgz",
+                              "version": "1.0.2",
+                              "from": "fstream@^1.0.2",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
                               "dependencies": {
                                 "graceful-fs": {
-                                  "version": "3.0.2",
+                                  "version": "3.0.4",
                                   "from": "graceful-fs@3",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 }
                               }
                             },
                             "inherits": {
                               "version": "2.0.1",
-                              "from": "inherits@~2.0.1",
+                              "from": "inherits@2",
                               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                             }
                           }
@@ -1305,13 +520,13 @@
                               "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
                               "dependencies": {
                                 "graceful-fs": {
-                                  "version": "3.0.2",
-                                  "from": "graceful-fs@3",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@~3.0.2",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@2",
+                                  "from": "inherits@~2.0.0",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
@@ -1363,9 +578,9 @@
                               }
                             },
                             "readable-stream": {
-                              "version": "1.0.27-1",
+                              "version": "1.0.33",
                               "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
@@ -1378,13 +593,13 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "string_decoder": {
-                                  "version": "0.10.25-1",
+                                  "version": "0.10.31",
                                   "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@2",
+                                  "from": "inherits@~2.0.1",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
@@ -1409,9 +624,9 @@
                           }
                         },
                         "rc": {
-                          "version": "0.5.0",
-                          "from": "rc@~0.5.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.0.tgz",
+                          "version": "0.5.4",
+                          "from": "rc@~0.5.1",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz",
                           "dependencies": {
                             "minimist": {
                               "version": "0.0.10",
@@ -1441,25 +656,867 @@
                           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
                         }
                       }
+                    }
+                  }
+                },
+                "zipfile": {
+                  "version": "0.5.4",
+                  "from": "zipfile@~0.5.4",
+                  "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz",
+                  "dependencies": {
+                    "nan": {
+                      "version": "1.4.1",
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
-                    "set-immediate": {
-                      "version": "0.1.1",
-                      "from": "set-immediate@0.1.1"
+                    "node-pre-gyp": {
+                      "version": "0.6.1",
+                      "from": "node-pre-gyp@~0.6.1",
+                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.1.tgz",
+                      "dependencies": {
+                        "nopt": {
+                          "version": "3.0.1",
+                          "from": "nopt@~3.0.1",
+                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
+                          "dependencies": {
+                            "abbrev": {
+                              "version": "1.0.5",
+                              "from": "abbrev@1",
+                              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                            }
+                          }
+                        },
+                        "npmlog": {
+                          "version": "0.1.1",
+                          "from": "npmlog@~0.1.1",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
+                          "dependencies": {
+                            "ansi": {
+                              "version": "0.3.0",
+                              "from": "ansi@~0.3.0",
+                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                            }
+                          }
+                        },
+                        "request": {
+                          "version": "2.48.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
+                          "dependencies": {
+                            "bl": {
+                              "version": "0.9.3",
+                              "from": "bl@~0.9.0",
+                              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@~1.0.26",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "0.0.1",
+                                      "from": "isarray@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@~0.10.x",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@~2.0.1",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "caseless": {
+                              "version": "0.7.0",
+                              "from": "caseless@~0.7.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
+                            },
+                            "forever-agent": {
+                              "version": "0.5.2",
+                              "from": "forever-agent@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                            },
+                            "form-data": {
+                              "version": "0.1.4",
+                              "from": "form-data@~0.1.0",
+                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                              "dependencies": {
+                                "mime": {
+                                  "version": "1.2.11",
+                                  "from": "mime@~1.2.11",
+                                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                                },
+                                "async": {
+                                  "version": "0.9.0",
+                                  "from": "async@~0.9.0",
+                                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                                }
+                              }
+                            },
+                            "json-stringify-safe": {
+                              "version": "5.0.0",
+                              "from": "json-stringify-safe@~5.0.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                            },
+                            "mime-types": {
+                              "version": "1.0.2",
+                              "from": "mime-types@~1.0.1",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            },
+                            "node-uuid": {
+                              "version": "1.4.1",
+                              "from": "node-uuid@~1.4.0",
+                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+                            },
+                            "qs": {
+                              "version": "2.3.3",
+                              "from": "qs@~2.3.1",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                            },
+                            "tunnel-agent": {
+                              "version": "0.4.0",
+                              "from": "tunnel-agent@~0.4.0",
+                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                            },
+                            "tough-cookie": {
+                              "version": "0.12.1",
+                              "from": "tough-cookie@>=0.12.0",
+                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                              "dependencies": {
+                                "punycode": {
+                                  "version": "1.3.2",
+                                  "from": "punycode@>=0.2.0",
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                                }
+                              }
+                            },
+                            "http-signature": {
+                              "version": "0.10.0",
+                              "from": "http-signature@~0.10.0",
+                              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+                              "dependencies": {
+                                "assert-plus": {
+                                  "version": "0.1.2",
+                                  "from": "assert-plus@0.1.2",
+                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+                                },
+                                "asn1": {
+                                  "version": "0.1.11",
+                                  "from": "asn1@0.1.11",
+                                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                                },
+                                "ctype": {
+                                  "version": "0.5.2",
+                                  "from": "ctype@0.5.2",
+                                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+                                }
+                              }
+                            },
+                            "oauth-sign": {
+                              "version": "0.5.0",
+                              "from": "oauth-sign@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+                            },
+                            "hawk": {
+                              "version": "1.1.1",
+                              "from": "hawk@1.1.1",
+                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                              "dependencies": {
+                                "hoek": {
+                                  "version": "0.9.1",
+                                  "from": "hoek@0.9.x",
+                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                                },
+                                "boom": {
+                                  "version": "0.4.2",
+                                  "from": "boom@0.4.x",
+                                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                                },
+                                "cryptiles": {
+                                  "version": "0.2.2",
+                                  "from": "cryptiles@0.2.x",
+                                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                                },
+                                "sntp": {
+                                  "version": "0.2.4",
+                                  "from": "sntp@0.2.x",
+                                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                                }
+                              }
+                            },
+                            "aws-sign2": {
+                              "version": "0.5.0",
+                              "from": "aws-sign2@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                            },
+                            "stringstream": {
+                              "version": "0.0.4",
+                              "from": "stringstream@~0.0.4",
+                              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                            },
+                            "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",
+                              "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"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "semver": {
+                          "version": "4.1.0",
+                          "from": "semver@~4.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
+                        },
+                        "tar": {
+                          "version": "1.0.2",
+                          "from": "tar@~1.0.2",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+                          "dependencies": {
+                            "block-stream": {
+                              "version": "0.0.7",
+                              "from": "block-stream@*",
+                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                            },
+                            "fstream": {
+                              "version": "1.0.2",
+                              "from": "fstream@^1.0.2",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@3",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+                                }
+                              }
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@2",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            }
+                          }
+                        },
+                        "tar-pack": {
+                          "version": "2.0.0",
+                          "from": "tar-pack@~2.0.0",
+                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
+                          "dependencies": {
+                            "uid-number": {
+                              "version": "0.0.3",
+                              "from": "uid-number@0.0.3",
+                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
+                            },
+                            "once": {
+                              "version": "1.1.1",
+                              "from": "once@~1.1.1",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
+                            },
+                            "debug": {
+                              "version": "0.7.4",
+                              "from": "debug@~0.7.2",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                            },
+                            "fstream": {
+                              "version": "0.1.31",
+                              "from": "fstream@~0.1.22",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@~3.0.2",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "tar": {
+                              "version": "0.1.20",
+                              "from": "tar@~0.1.17",
+                              "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
+                              "dependencies": {
+                                "block-stream": {
+                                  "version": "0.0.7",
+                                  "from": "block-stream@*",
+                                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "fstream-ignore": {
+                              "version": "0.0.7",
+                              "from": "fstream-ignore@0.0.7",
+                              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
+                              "dependencies": {
+                                "minimatch": {
+                                  "version": "0.2.14",
+                                  "from": "minimatch@~0.2.0",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                                  "dependencies": {
+                                    "lru-cache": {
+                                      "version": "2.5.0",
+                                      "from": "lru-cache@2",
+                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                                    },
+                                    "sigmund": {
+                                      "version": "1.0.0",
+                                      "from": "sigmund@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@~1.0.2",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@1.2",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            }
+                          }
+                        },
+                        "mkdirp": {
+                          "version": "0.5.0",
+                          "from": "mkdirp@~0.5.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.8",
+                              "from": "minimist@0.0.8",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "0.5.4",
+                          "from": "rc@~0.5.1",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.10",
+                              "from": "minimist@~0.0.7",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                            },
+                            "deep-extend": {
+                              "version": "0.2.11",
+                              "from": "deep-extend@~0.2.5",
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                            },
+                            "strip-json-comments": {
+                              "version": "0.1.3",
+                              "from": "strip-json-comments@0.1.x",
+                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                            },
+                            "ini": {
+                              "version": "1.1.0",
+                              "from": "ini@~1.1.0",
+                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.2.8",
+                          "from": "rimraf@~2.2.8",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                        }
+                      }
+                    }
+                  }
+                },
+                "sqlite3": {
+                  "version": "3.0.4",
+                  "from": "sqlite3@2.x || 3.x",
+                  "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.0.4.tgz",
+                  "dependencies": {
+                    "nan": {
+                      "version": "1.4.1",
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
+                    },
+                    "node-pre-gyp": {
+                      "version": "0.6.1",
+                      "from": "node-pre-gyp@~0.6.1",
+                      "dependencies": {
+                        "nopt": {
+                          "version": "3.0.1",
+                          "from": "nopt@~3.0.1",
+                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
+                          "dependencies": {
+                            "abbrev": {
+                              "version": "1.0.5",
+                              "from": "abbrev@1",
+                              "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
+                            }
+                          }
+                        },
+                        "npmlog": {
+                          "version": "0.1.1",
+                          "from": "npmlog@~0.1.1",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
+                          "dependencies": {
+                            "ansi": {
+                              "version": "0.3.0",
+                              "from": "ansi@~0.3.0",
+                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
+                            }
+                          }
+                        },
+                        "request": {
+                          "version": "2.48.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
+                          "dependencies": {
+                            "bl": {
+                              "version": "0.9.3",
+                              "from": "bl@~0.9.0",
+                              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@~1.0.26",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "0.0.1",
+                                      "from": "isarray@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@~0.10.x",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@~2.0.1",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "caseless": {
+                              "version": "0.7.0",
+                              "from": "caseless@~0.7.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
+                            },
+                            "forever-agent": {
+                              "version": "0.5.2",
+                              "from": "forever-agent@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+                            },
+                            "form-data": {
+                              "version": "0.1.4",
+                              "from": "form-data@~0.1.0",
+                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                              "dependencies": {
+                                "mime": {
+                                  "version": "1.2.11",
+                                  "from": "mime@~1.2.11",
+                                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                                },
+                                "async": {
+                                  "version": "0.9.0",
+                                  "from": "async@~0.9.0",
+                                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                                }
+                              }
+                            },
+                            "json-stringify-safe": {
+                              "version": "5.0.0",
+                              "from": "json-stringify-safe@~5.0.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                            },
+                            "mime-types": {
+                              "version": "1.0.2",
+                              "from": "mime-types@~1.0.1",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            },
+                            "node-uuid": {
+                              "version": "1.4.1",
+                              "from": "node-uuid@~1.4.0",
+                              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+                            },
+                            "qs": {
+                              "version": "2.3.3",
+                              "from": "qs@~2.3.1",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                            },
+                            "tunnel-agent": {
+                              "version": "0.4.0",
+                              "from": "tunnel-agent@~0.4.0",
+                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                            },
+                            "tough-cookie": {
+                              "version": "0.12.1",
+                              "from": "tough-cookie@>=0.12.0",
+                              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+                              "dependencies": {
+                                "punycode": {
+                                  "version": "1.3.2",
+                                  "from": "punycode@>=0.2.0",
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                                }
+                              }
+                            },
+                            "http-signature": {
+                              "version": "0.10.0",
+                              "from": "http-signature@~0.10.0",
+                              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
+                              "dependencies": {
+                                "assert-plus": {
+                                  "version": "0.1.2",
+                                  "from": "assert-plus@0.1.2",
+                                  "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
+                                },
+                                "asn1": {
+                                  "version": "0.1.11",
+                                  "from": "asn1@0.1.11",
+                                  "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+                                },
+                                "ctype": {
+                                  "version": "0.5.2",
+                                  "from": "ctype@0.5.2",
+                                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
+                                }
+                              }
+                            },
+                            "oauth-sign": {
+                              "version": "0.5.0",
+                              "from": "oauth-sign@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
+                            },
+                            "hawk": {
+                              "version": "1.1.1",
+                              "from": "hawk@1.1.1",
+                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+                              "dependencies": {
+                                "hoek": {
+                                  "version": "0.9.1",
+                                  "from": "hoek@0.9.x",
+                                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                                },
+                                "boom": {
+                                  "version": "0.4.2",
+                                  "from": "boom@0.4.x",
+                                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                                },
+                                "cryptiles": {
+                                  "version": "0.2.2",
+                                  "from": "cryptiles@0.2.x",
+                                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                                },
+                                "sntp": {
+                                  "version": "0.2.4",
+                                  "from": "sntp@0.2.x",
+                                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                                }
+                              }
+                            },
+                            "aws-sign2": {
+                              "version": "0.5.0",
+                              "from": "aws-sign2@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                            },
+                            "stringstream": {
+                              "version": "0.0.4",
+                              "from": "stringstream@~0.0.4",
+                              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                            },
+                            "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",
+                              "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"
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "semver": {
+                          "version": "4.1.0",
+                          "from": "semver@~4.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
+                        },
+                        "tar": {
+                          "version": "1.0.2",
+                          "from": "tar@~1.0.2",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
+                          "dependencies": {
+                            "block-stream": {
+                              "version": "0.0.7",
+                              "from": "block-stream@*",
+                              "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                            },
+                            "fstream": {
+                              "version": "1.0.2",
+                              "from": "fstream@^1.0.2",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@3",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+                                }
+                              }
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@2",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                            }
+                          }
+                        },
+                        "tar-pack": {
+                          "version": "2.0.0",
+                          "from": "tar-pack@~2.0.0",
+                          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
+                          "dependencies": {
+                            "uid-number": {
+                              "version": "0.0.3",
+                              "from": "uid-number@0.0.3",
+                              "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
+                            },
+                            "once": {
+                              "version": "1.1.1",
+                              "from": "once@~1.1.1",
+                              "resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
+                            },
+                            "debug": {
+                              "version": "0.7.4",
+                              "from": "debug@~0.7.2",
+                              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+                            },
+                            "fstream": {
+                              "version": "0.1.31",
+                              "from": "fstream@~0.1.22",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
+                              "dependencies": {
+                                "graceful-fs": {
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@~3.0.2",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.0",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "tar": {
+                              "version": "0.1.20",
+                              "from": "tar@~0.1.17",
+                              "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
+                              "dependencies": {
+                                "block-stream": {
+                                  "version": "0.0.7",
+                                  "from": "block-stream@*",
+                                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "fstream-ignore": {
+                              "version": "0.0.7",
+                              "from": "fstream-ignore@0.0.7",
+                              "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
+                              "dependencies": {
+                                "minimatch": {
+                                  "version": "0.2.14",
+                                  "from": "minimatch@~0.2.0",
+                                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                                  "dependencies": {
+                                    "lru-cache": {
+                                      "version": "2.5.0",
+                                      "from": "lru-cache@2",
+                                      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                                    },
+                                    "sigmund": {
+                                      "version": "1.0.0",
+                                      "from": "sigmund@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                                    }
+                                  }
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "readable-stream": {
+                              "version": "1.0.33",
+                              "from": "readable-stream@~1.0.2",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                              "dependencies": {
+                                "core-util-is": {
+                                  "version": "1.0.1",
+                                  "from": "core-util-is@~1.0.0",
+                                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                },
+                                "isarray": {
+                                  "version": "0.0.1",
+                                  "from": "isarray@0.0.1",
+                                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                },
+                                "string_decoder": {
+                                  "version": "0.10.31",
+                                  "from": "string_decoder@~0.10.x",
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@~2.0.1",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
+                            "graceful-fs": {
+                              "version": "1.2.3",
+                              "from": "graceful-fs@1.2",
+                              "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
+                            }
+                          }
+                        },
+                        "mkdirp": {
+                          "version": "0.5.0",
+                          "from": "mkdirp@~0.5.0",
+                          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.8",
+                              "from": "minimist@0.0.8",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                            }
+                          }
+                        },
+                        "rc": {
+                          "version": "0.5.4",
+                          "from": "rc@~0.5.1",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz",
+                          "dependencies": {
+                            "minimist": {
+                              "version": "0.0.10",
+                              "from": "minimist@~0.0.7",
+                              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+                            },
+                            "deep-extend": {
+                              "version": "0.2.11",
+                              "from": "deep-extend@~0.2.5",
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
+                            },
+                            "strip-json-comments": {
+                              "version": "0.1.3",
+                              "from": "strip-json-comments@0.1.x",
+                              "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
+                            },
+                            "ini": {
+                              "version": "1.1.0",
+                              "from": "ini@~1.1.0",
+                              "resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
+                            }
+                          }
+                        },
+                        "rimraf": {
+                          "version": "2.2.8",
+                          "from": "rimraf@~2.2.8",
+                          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
+                        }
+                      }
                     }
                   }
                 },
                 "mime": {
                   "version": "1.2.11",
-                  "from": "mime@~1.2.9",
+                  "from": "mime@~1.2.11",
                   "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "mkdirp": {
-                  "version": "0.3.5",
-                  "from": "mkdirp@~0.3.3"
+                  "version": "0.5.0",
+                  "from": "mkdirp@~0.5.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    }
+                  }
                 },
                 "optimist": {
                   "version": "0.6.1",
-                  "from": "optimist@~0.6.0",
+                  "from": "optimist@~0.6.1",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -1504,17 +1561,20 @@
             },
             "mkdirp": {
               "version": "0.3.0",
-              "from": "mkdirp@0.3.0"
+              "from": "mkdirp@0.3.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
             }
           }
         },
         "tilelive": {
           "version": "4.5.3",
           "from": "tilelive@~4.5.3",
+          "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -1978,11 +2038,13 @@
             },
             "mapnik-reference": {
               "version": "5.0.9",
-              "from": "mapnik-reference@~5.0.7"
+              "from": "mapnik-reference@~5.0.7",
+              "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
             },
             "xml2js": {
               "version": "0.2.8",
               "from": "xml2js@~0.2.4",
+              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
               "dependencies": {
                 "sax": {
                   "version": "0.5.8",
@@ -1993,6 +2055,7 @@
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -2018,7 +2081,8 @@
         },
         "node-statsd": {
           "version": "0.0.7",
-          "from": "node-statsd@~0.0.7"
+          "from": "node-statsd@~0.0.7",
+          "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
         }
       }
     }
diff --git a/package.json b/package.json
index ecd7190f..4238ac33 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
         "cartodb-psql": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0",
         "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.3.0",
         "lzma": "~1.3.7",
-        "log4js": "~0.6.17",
+        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
         "rollbar": "~0.3.13"
     },
     "devDependencies": {

From ea7eed4ad0240f7ccef3e0ae2fe390cb939cc0a8 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 2 Dec 2014 16:37:41 +0100
Subject: [PATCH 11/22] Upgrades windshaft to 0.32.1

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

diff --git a/NEWS.md b/NEWS.md
index 69257515..1c067382 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 --------------------
 
 Announcements:
- - Upgrades windshaft to 0.32.0
+ - Upgrades windshaft to 0.32.1
 
 
 1.21.0 -- 2014-10-24
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0303b8fb..bc6c348b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -68,7 +68,7 @@
     "log4js": {
       "version": "0.6.21",
       "from": "log4js@~0.6.17",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.21.tgz",
+      "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb",
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -86,7 +86,8 @@
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@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",
@@ -173,9 +174,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.32.0",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.0",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.0",
+      "version": "0.32.1",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -183,9 +184,9 @@
           "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
         },
         "grainstore": {
-          "version": "0.22.0",
-          "from": "https://github.com/CartoDB/grainstore/tarball/0.22.0",
-          "resolved": "https://github.com/CartoDB/grainstore/tarball/0.22.0",
+          "version": "0.22.1",
+          "from": "https://github.com/CartoDB/grainstore/tarball/0.22.1",
+          "resolved": "https://github.com/CartoDB/grainstore/tarball/0.22.1",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
@@ -199,11 +200,13 @@
                 },
                 "mapnik-reference": {
                   "version": "5.0.9",
-                  "from": "mapnik-reference@~5.0.7"
+                  "from": "mapnik-reference@~5.0.7",
+                  "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
                 },
                 "xml2js": {
                   "version": "0.2.8",
                   "from": "xml2js@~0.2.4",
+                  "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.8",
@@ -214,6 +217,7 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -229,7 +233,8 @@
             },
             "millstone": {
               "version": "0.6.14",
-              "from": "millstone@~0.6.14",
+              "from": "millstone@0.6.14",
+              "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.14.tgz",
               "dependencies": {
                 "generic-pool": {
                   "version": "2.0.4",
@@ -238,6 +243,7 @@
                 "request": {
                   "version": "2.34.0",
                   "from": "request@~2.34.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz",
                   "dependencies": {
                     "qs": {
                       "version": "0.6.6",
@@ -278,7 +284,8 @@
                           "dependencies": {
                             "delayed-stream": {
                               "version": "0.0.5",
-                              "from": "delayed-stream@0.0.5"
+                              "from": "delayed-stream@0.0.5",
+                              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                             }
                           }
                         },
@@ -318,6 +325,7 @@
                     "hawk": {
                       "version": "1.0.0",
                       "from": "hawk@~1.0.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
                       "dependencies": {
                         "hoek": {
                           "version": "0.9.1",
@@ -345,22 +353,24 @@
                   }
                 },
                 "srs": {
-                  "version": "0.4.3",
+                  "version": "0.4.6",
                   "from": "srs@~0.4.1",
+                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz",
                   "dependencies": {
                     "nan": {
-                      "version": "1.2.0",
-                      "from": "nan@~1.2.0"
+                      "version": "1.4.1",
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
                     "node-pre-gyp": {
-                      "version": "0.5.17",
-                      "from": "node-pre-gyp@0.5.x",
-                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.17.tgz",
+                      "version": "0.6.1",
+                      "from": "node-pre-gyp@~0.6.1",
+                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.1.tgz",
                       "dependencies": {
                         "nopt": {
-                          "version": "2.2.1",
-                          "from": "nopt@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+                          "version": "3.0.1",
+                          "from": "nopt@~3.0.1",
+                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
                           "dependencies": {
                             "abbrev": {
                               "version": "1.0.5",
@@ -370,88 +380,120 @@
                           }
                         },
                         "npmlog": {
-                          "version": "0.0.6",
-                          "from": "npmlog@~0.0.6",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz",
+                          "version": "0.1.1",
+                          "from": "npmlog@~0.1.1",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
                           "dependencies": {
                             "ansi": {
-                              "version": "0.2.1",
-                              "from": "ansi@~0.2.1",
-                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "ansi@~0.3.0",
+                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
                             }
                           }
                         },
                         "request": {
-                          "version": "2.36.0",
-                          "from": "request@2",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+                          "version": "2.48.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
                           "dependencies": {
-                            "qs": {
-                              "version": "0.6.6",
-                              "from": "qs@~0.6.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+                            "bl": {
+                              "version": "0.9.3",
+                              "from": "bl@~0.9.0",
+                              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@~1.0.26",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "0.0.1",
+                                      "from": "isarray@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@~0.10.x",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@~2.0.1",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
                             },
-                            "json-stringify-safe": {
-                              "version": "5.0.0",
-                              "from": "json-stringify-safe@~5.0.0",
-                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                            },
-                            "mime": {
-                              "version": "1.2.11",
-                              "from": "mime@~1.2.9",
-                              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                            "caseless": {
+                              "version": "0.7.0",
+                              "from": "caseless@~0.7.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
                             },
                             "forever-agent": {
                               "version": "0.5.2",
                               "from": "forever-agent@~0.5.0",
                               "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
                             },
+                            "form-data": {
+                              "version": "0.1.4",
+                              "from": "form-data@~0.1.0",
+                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                              "dependencies": {
+                                "mime": {
+                                  "version": "1.2.11",
+                                  "from": "mime@~1.2.11",
+                                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                                },
+                                "async": {
+                                  "version": "0.9.0",
+                                  "from": "async@~0.9.0",
+                                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                                }
+                              }
+                            },
+                            "json-stringify-safe": {
+                              "version": "5.0.0",
+                              "from": "json-stringify-safe@~5.0.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                            },
+                            "mime-types": {
+                              "version": "1.0.2",
+                              "from": "mime-types@~1.0.1",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            },
                             "node-uuid": {
                               "version": "1.4.1",
                               "from": "node-uuid@~1.4.0",
                               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
                             },
+                            "qs": {
+                              "version": "2.3.3",
+                              "from": "qs@~2.3.1",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                            },
+                            "tunnel-agent": {
+                              "version": "0.4.0",
+                              "from": "tunnel-agent@~0.4.0",
+                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                            },
                             "tough-cookie": {
                               "version": "0.12.1",
                               "from": "tough-cookie@>=0.12.0",
                               "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
                               "dependencies": {
                                 "punycode": {
-                                  "version": "1.2.4",
+                                  "version": "1.3.2",
                                   "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                                 }
                               }
                             },
-                            "form-data": {
-                              "version": "0.1.2",
-                              "from": "form-data@~0.1.0",
-                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz",
-                              "dependencies": {
-                                "combined-stream": {
-                                  "version": "0.0.4",
-                                  "from": "combined-stream@~0.0.4",
-                                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.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"
-                                    }
-                                  }
-                                },
-                                "async": {
-                                  "version": "0.2.10",
-                                  "from": "async@~0.2.9",
-                                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                                }
-                              }
-                            },
-                            "tunnel-agent": {
-                              "version": "0.4.0",
-                              "from": "tunnel-agent@~0.4.0",
-                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-                            },
                             "http-signature": {
                               "version": "0.10.0",
                               "from": "http-signature@~0.10.0",
@@ -475,14 +517,14 @@
                               }
                             },
                             "oauth-sign": {
-                              "version": "0.3.0",
-                              "from": "oauth-sign@~0.3.0",
-                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+                              "version": "0.5.0",
+                              "from": "oauth-sign@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
                             },
                             "hawk": {
-                              "version": "1.0.0",
-                              "from": "hawk@~1.0.0",
-                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+                              "version": "1.1.1",
+                              "from": "hawk@1.1.1",
+                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
                               "dependencies": {
                                 "hoek": {
                                   "version": "0.9.1",
@@ -510,45 +552,57 @@
                               "version": "0.5.0",
                               "from": "aws-sign2@~0.5.0",
                               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                            },
+                            "stringstream": {
+                              "version": "0.0.4",
+                              "from": "stringstream@~0.0.4",
+                              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                            },
+                            "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",
+                              "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"
+                                }
+                              }
                             }
                           }
                         },
                         "semver": {
-                          "version": "2.3.0",
-                          "from": "semver@~2.3.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz"
+                          "version": "4.1.0",
+                          "from": "semver@~4.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
                         },
                         "tar": {
-                          "version": "0.1.19",
-                          "from": "tar@~0.1.19",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz",
+                          "version": "1.0.2",
+                          "from": "tar@~1.0.2",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
                           "dependencies": {
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
                             "block-stream": {
                               "version": "0.0.7",
                               "from": "block-stream@*",
                               "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
                             },
                             "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.8",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
+                              "version": "1.0.2",
+                              "from": "fstream@^1.0.2",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
                               "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
                                 "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@3",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 }
                               }
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@2",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                             }
                           }
                         },
@@ -573,19 +627,14 @@
                               "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
                             },
                             "fstream": {
-                              "version": "0.1.25",
+                              "version": "0.1.31",
                               "from": "fstream@~0.1.22",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
                               "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
                                 "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@~3.0.2",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
@@ -594,6 +643,23 @@
                                 }
                               }
                             },
+                            "tar": {
+                              "version": "0.1.20",
+                              "from": "tar@~0.1.17",
+                              "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
+                              "dependencies": {
+                                "block-stream": {
+                                  "version": "0.0.7",
+                                  "from": "block-stream@*",
+                                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
                             "fstream-ignore": {
                               "version": "0.0.7",
                               "from": "fstream-ignore@0.0.7",
@@ -618,15 +684,15 @@
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
+                                  "from": "inherits@2",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
                             },
                             "readable-stream": {
-                              "version": "1.0.27-1",
+                              "version": "1.0.33",
                               "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
@@ -639,13 +705,13 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "string_decoder": {
-                                  "version": "0.10.25-1",
+                                  "version": "0.10.31",
                                   "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
+                                  "from": "inherits@~2.0.1",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
@@ -670,9 +736,9 @@
                           }
                         },
                         "rc": {
-                          "version": "0.4.0",
-                          "from": "rc@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz",
+                          "version": "0.5.4",
+                          "from": "rc@~0.5.1",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz",
                           "dependencies": {
                             "minimist": {
                               "version": "0.0.10",
@@ -680,9 +746,9 @@
                               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
                             },
                             "deep-extend": {
-                              "version": "0.2.10",
+                              "version": "0.2.11",
                               "from": "deep-extend@~0.2.5",
-                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz"
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
                             },
                             "strip-json-comments": {
                               "version": "0.1.3",
@@ -698,7 +764,7 @@
                         },
                         "rimraf": {
                           "version": "2.2.8",
-                          "from": "rimraf@~2.2.5",
+                          "from": "rimraf@~2.2.8",
                           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
                         }
                       }
@@ -706,21 +772,24 @@
                   }
                 },
                 "zipfile": {
-                  "version": "0.5.3",
+                  "version": "0.5.4",
                   "from": "zipfile@~0.5.2",
+                  "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz",
                   "dependencies": {
                     "nan": {
-                      "version": "1.2.0",
-                      "from": "nan@~1.2.0"
+                      "version": "1.4.1",
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
                     "node-pre-gyp": {
-                      "version": "0.5.19",
-                      "from": "node-pre-gyp@0.5.x",
+                      "version": "0.6.1",
+                      "from": "node-pre-gyp@~0.6.1",
+                      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.1.tgz",
                       "dependencies": {
                         "nopt": {
-                          "version": "2.2.1",
-                          "from": "nopt@~2.2.0",
-                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+                          "version": "3.0.1",
+                          "from": "nopt@~3.0.1",
+                          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
                           "dependencies": {
                             "abbrev": {
                               "version": "1.0.5",
@@ -730,88 +799,120 @@
                           }
                         },
                         "npmlog": {
-                          "version": "0.0.6",
-                          "from": "npmlog@~0.0.6",
-                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz",
+                          "version": "0.1.1",
+                          "from": "npmlog@~0.1.1",
+                          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
                           "dependencies": {
                             "ansi": {
-                              "version": "0.2.1",
-                              "from": "ansi@~0.2.1",
-                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"
+                              "version": "0.3.0",
+                              "from": "ansi@~0.3.0",
+                              "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
                             }
                           }
                         },
                         "request": {
-                          "version": "2.36.0",
-                          "from": "request@2",
-                          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+                          "version": "2.48.0",
+                          "from": "request@2.x",
+                          "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
                           "dependencies": {
-                            "qs": {
-                              "version": "0.6.6",
-                              "from": "qs@~0.6.0",
-                              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+                            "bl": {
+                              "version": "0.9.3",
+                              "from": "bl@~0.9.0",
+                              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
+                              "dependencies": {
+                                "readable-stream": {
+                                  "version": "1.0.33",
+                                  "from": "readable-stream@~1.0.26",
+                                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                                  "dependencies": {
+                                    "core-util-is": {
+                                      "version": "1.0.1",
+                                      "from": "core-util-is@~1.0.0",
+                                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+                                    },
+                                    "isarray": {
+                                      "version": "0.0.1",
+                                      "from": "isarray@0.0.1",
+                                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                                    },
+                                    "string_decoder": {
+                                      "version": "0.10.31",
+                                      "from": "string_decoder@~0.10.x",
+                                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                                    },
+                                    "inherits": {
+                                      "version": "2.0.1",
+                                      "from": "inherits@~2.0.1",
+                                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                    }
+                                  }
+                                }
+                              }
                             },
-                            "json-stringify-safe": {
-                              "version": "5.0.0",
-                              "from": "json-stringify-safe@~5.0.0",
-                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
-                            },
-                            "mime": {
-                              "version": "1.2.11",
-                              "from": "mime@~1.2.9",
-                              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                            "caseless": {
+                              "version": "0.7.0",
+                              "from": "caseless@~0.7.0",
+                              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
                             },
                             "forever-agent": {
                               "version": "0.5.2",
                               "from": "forever-agent@~0.5.0",
                               "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
                             },
+                            "form-data": {
+                              "version": "0.1.4",
+                              "from": "form-data@~0.1.0",
+                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+                              "dependencies": {
+                                "mime": {
+                                  "version": "1.2.11",
+                                  "from": "mime@~1.2.11",
+                                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                                },
+                                "async": {
+                                  "version": "0.9.0",
+                                  "from": "async@~0.9.0",
+                                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                                }
+                              }
+                            },
+                            "json-stringify-safe": {
+                              "version": "5.0.0",
+                              "from": "json-stringify-safe@~5.0.0",
+                              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
+                            },
+                            "mime-types": {
+                              "version": "1.0.2",
+                              "from": "mime-types@~1.0.1",
+                              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
+                            },
                             "node-uuid": {
                               "version": "1.4.1",
                               "from": "node-uuid@~1.4.0",
                               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
                             },
+                            "qs": {
+                              "version": "2.3.3",
+                              "from": "qs@~2.3.1",
+                              "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
+                            },
+                            "tunnel-agent": {
+                              "version": "0.4.0",
+                              "from": "tunnel-agent@~0.4.0",
+                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+                            },
                             "tough-cookie": {
                               "version": "0.12.1",
                               "from": "tough-cookie@>=0.12.0",
                               "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
                               "dependencies": {
                                 "punycode": {
-                                  "version": "1.2.4",
+                                  "version": "1.3.2",
                                   "from": "punycode@>=0.2.0",
-                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz"
+                                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                                 }
                               }
                             },
-                            "form-data": {
-                              "version": "0.1.2",
-                              "from": "form-data@~0.1.0",
-                              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz",
-                              "dependencies": {
-                                "combined-stream": {
-                                  "version": "0.0.4",
-                                  "from": "combined-stream@~0.0.4",
-                                  "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.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"
-                                    }
-                                  }
-                                },
-                                "async": {
-                                  "version": "0.2.10",
-                                  "from": "async@~0.2.9",
-                                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                                }
-                              }
-                            },
-                            "tunnel-agent": {
-                              "version": "0.4.0",
-                              "from": "tunnel-agent@~0.4.0",
-                              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
-                            },
                             "http-signature": {
                               "version": "0.10.0",
                               "from": "http-signature@~0.10.0",
@@ -835,14 +936,14 @@
                               }
                             },
                             "oauth-sign": {
-                              "version": "0.3.0",
-                              "from": "oauth-sign@~0.3.0",
-                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+                              "version": "0.5.0",
+                              "from": "oauth-sign@~0.5.0",
+                              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
                             },
                             "hawk": {
-                              "version": "1.0.0",
-                              "from": "hawk@~1.0.0",
-                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+                              "version": "1.1.1",
+                              "from": "hawk@1.1.1",
+                              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
                               "dependencies": {
                                 "hoek": {
                                   "version": "0.9.1",
@@ -870,45 +971,57 @@
                               "version": "0.5.0",
                               "from": "aws-sign2@~0.5.0",
                               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+                            },
+                            "stringstream": {
+                              "version": "0.0.4",
+                              "from": "stringstream@~0.0.4",
+                              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
+                            },
+                            "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",
+                              "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"
+                                }
+                              }
                             }
                           }
                         },
                         "semver": {
-                          "version": "2.3.0",
-                          "from": "semver@~2.3.0",
-                          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.0.tgz"
+                          "version": "4.1.0",
+                          "from": "semver@~4.1.0",
+                          "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz"
                         },
                         "tar": {
-                          "version": "0.1.19",
-                          "from": "tar@~0.1.19",
-                          "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.19.tgz",
+                          "version": "1.0.2",
+                          "from": "tar@~1.0.2",
+                          "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz",
                           "dependencies": {
-                            "inherits": {
-                              "version": "2.0.1",
-                              "from": "inherits@2",
-                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                            },
                             "block-stream": {
                               "version": "0.0.7",
                               "from": "block-stream@*",
                               "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
                             },
                             "fstream": {
-                              "version": "0.1.25",
-                              "from": "fstream@~0.1.8",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
+                              "version": "1.0.2",
+                              "from": "fstream@^1.0.2",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
                               "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
                                 "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@3",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 }
                               }
+                            },
+                            "inherits": {
+                              "version": "2.0.1",
+                              "from": "inherits@2",
+                              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                             }
                           }
                         },
@@ -933,19 +1046,14 @@
                               "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
                             },
                             "fstream": {
-                              "version": "0.1.25",
+                              "version": "0.1.31",
                               "from": "fstream@~0.1.22",
-                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.25.tgz",
+                              "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
                               "dependencies": {
-                                "mkdirp": {
-                                  "version": "0.3.5",
-                                  "from": "mkdirp@0.3",
-                                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-                                },
                                 "graceful-fs": {
-                                  "version": "2.0.3",
-                                  "from": "graceful-fs@~2.0.0",
-                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"
+                                  "version": "3.0.4",
+                                  "from": "graceful-fs@~3.0.2",
+                                  "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
@@ -954,6 +1062,23 @@
                                 }
                               }
                             },
+                            "tar": {
+                              "version": "0.1.20",
+                              "from": "tar@~0.1.17",
+                              "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
+                              "dependencies": {
+                                "block-stream": {
+                                  "version": "0.0.7",
+                                  "from": "block-stream@*",
+                                  "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
+                                },
+                                "inherits": {
+                                  "version": "2.0.1",
+                                  "from": "inherits@2",
+                                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                                }
+                              }
+                            },
                             "fstream-ignore": {
                               "version": "0.0.7",
                               "from": "fstream-ignore@0.0.7",
@@ -978,15 +1103,15 @@
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
+                                  "from": "inherits@2",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
                             },
                             "readable-stream": {
-                              "version": "1.0.27-1",
+                              "version": "1.0.33",
                               "from": "readable-stream@~1.0.2",
-                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
+                              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
@@ -999,13 +1124,13 @@
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "string_decoder": {
-                                  "version": "0.10.25-1",
+                                  "version": "0.10.31",
                                   "from": "string_decoder@~0.10.x",
-                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "inherits@~2.0.0",
+                                  "from": "inherits@~2.0.1",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 }
                               }
@@ -1030,9 +1155,9 @@
                           }
                         },
                         "rc": {
-                          "version": "0.4.0",
-                          "from": "rc@~0.4.0",
-                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz",
+                          "version": "0.5.4",
+                          "from": "rc@~0.5.1",
+                          "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz",
                           "dependencies": {
                             "minimist": {
                               "version": "0.0.10",
@@ -1040,9 +1165,9 @@
                               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
                             },
                             "deep-extend": {
-                              "version": "0.2.10",
+                              "version": "0.2.11",
                               "from": "deep-extend@~0.2.5",
-                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.10.tgz"
+                              "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
                             },
                             "strip-json-comments": {
                               "version": "0.1.3",
@@ -1058,7 +1183,7 @@
                         },
                         "rimraf": {
                           "version": "2.2.8",
-                          "from": "rimraf@~2.2.5",
+                          "from": "rimraf@~2.2.8",
                           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
                         }
                       }
@@ -1068,6 +1193,7 @@
                 "sqlite3": {
                   "version": "2.2.7",
                   "from": "sqlite3@2.x",
+                  "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.1.2",
@@ -1460,6 +1586,7 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -1504,17 +1631,20 @@
             },
             "mkdirp": {
               "version": "0.3.0",
-              "from": "mkdirp@0.3.0"
+              "from": "mkdirp@0.3.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
             }
           }
         },
         "tilelive": {
           "version": "4.5.3",
           "from": "tilelive@~4.5.3",
+          "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -1528,7 +1658,7 @@
             },
             "sphericalmercator": {
               "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.1"
+              "from": "sphericalmercator@~1.0.2"
             }
           }
         },
@@ -1978,11 +2108,13 @@
             },
             "mapnik-reference": {
               "version": "5.0.9",
-              "from": "mapnik-reference@~5.0.7"
+              "from": "mapnik-reference@~5.0.7",
+              "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
             },
             "xml2js": {
               "version": "0.2.8",
               "from": "xml2js@~0.2.4",
+              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
               "dependencies": {
                 "sax": {
                   "version": "0.5.8",
@@ -1993,6 +2125,7 @@
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -2018,7 +2151,8 @@
         },
         "node-statsd": {
           "version": "0.0.7",
-          "from": "node-statsd@~0.0.7"
+          "from": "node-statsd@~0.0.7",
+          "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
         }
       }
     }
diff --git a/package.json b/package.json
index ecd7190f..7846124e 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",

From eae1fbff8adcc6328abef8cea40214f495e8b959 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 10 Dec 2014 20:25:27 +0100
Subject: [PATCH 12/22] Upgrades windshaft

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

diff --git a/NEWS.md b/NEWS.md
index e85e78d9..eddc88a7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 --------------------
 
 Announcements:
- - Upgrades windshaft to 0.32.1
+ - Upgrades windshaft to upgrade-mapnik branch
 
 Bugfixes:
  - Closes fd for log files on `kill -HUP` (#230)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 76bc76f1..8e7d6d09 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -52,8 +52,7 @@
                 },
                 "nan": {
                   "version": "1.1.2",
-                  "from": "nan@~1.1.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+                  "from": "nan@~1.1.0"
                 }
               }
             }
@@ -62,8 +61,9 @@
       }
     },
     "dot": {
-      "version": "1.0.2",
-      "from": "dot@~1.0.2"
+      "version": "1.0.3",
+      "from": "dot@~1.0.2",
+      "resolved": "https://registry.npmjs.org/dot/-/dot-1.0.3.tgz"
     },
     "log4js": {
       "version": "0.6.21",
@@ -82,7 +82,8 @@
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0"
+              "from": "core-util-is@~1.0.0",
+              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
             },
             "isarray": {
               "version": "0.0.1",
@@ -91,7 +92,8 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x"
+              "from": "string_decoder@~0.10.x",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
             },
             "inherits": {
               "version": "2.0.1",
@@ -103,7 +105,8 @@
     },
     "lzma": {
       "version": "1.3.7",
-      "from": "lzma@~1.3.7"
+      "from": "lzma@~1.3.7",
+      "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz"
     },
     "node-varnish": {
       "version": "0.3.0",
@@ -133,8 +136,7 @@
             },
             "nan": {
               "version": "1.1.2",
-              "from": "nan@~1.1.0",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+              "from": "nan@~1.1.0"
             }
           }
         }
@@ -148,15 +150,16 @@
     "rollbar": {
       "version": "0.3.13",
       "from": "rollbar@~0.3.13",
+      "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-0.3.13.tgz",
       "dependencies": {
         "node-uuid": {
-          "version": "1.4.1",
-          "from": "node-uuid@1.4.x",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+          "version": "1.4.2",
+          "from": "node-uuid@1.4.x"
         },
         "lru-cache": {
           "version": "2.2.4",
-          "from": "lru-cache@~2.2.1"
+          "from": "lru-cache@~2.2.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
@@ -170,13 +173,12 @@
     },
     "underscore": {
       "version": "1.6.0",
-      "from": "underscore@~1.6.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
+      "from": "underscore@~1.6.0"
     },
     "windshaft": {
-      "version": "0.32.1",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
+      "version": "0.32.2",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -195,18 +197,15 @@
               "dependencies": {
                 "underscore": {
                   "version": "1.4.4",
-                  "from": "underscore@~1.4.3",
-                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
+                  "from": "underscore@~1.4.3"
                 },
                 "mapnik-reference": {
                   "version": "5.0.9",
-                  "from": "mapnik-reference@~5.0.7",
-                  "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
+                  "from": "mapnik-reference@~5.0.7"
                 },
                 "xml2js": {
                   "version": "0.2.8",
                   "from": "xml2js@~0.2.4",
-                  "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.8",
@@ -217,7 +216,6 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
-                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -234,7 +232,6 @@
             "millstone": {
               "version": "0.6.14",
               "from": "millstone@0.6.14",
-              "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.14.tgz",
               "dependencies": {
                 "generic-pool": {
                   "version": "2.0.4",
@@ -243,7 +240,6 @@
                 "request": {
                   "version": "2.34.0",
                   "from": "request@~2.34.0",
-                  "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz",
                   "dependencies": {
                     "qs": {
                       "version": "0.6.6",
@@ -258,9 +254,8 @@
                       "from": "forever-agent@~0.5.0"
                     },
                     "node-uuid": {
-                      "version": "1.4.1",
-                      "from": "node-uuid@~1.4.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
+                      "version": "1.4.2",
+                      "from": "node-uuid@~1.4.0"
                     },
                     "tough-cookie": {
                       "version": "0.12.1",
@@ -268,8 +263,7 @@
                       "dependencies": {
                         "punycode": {
                           "version": "1.3.2",
-                          "from": "punycode@>=0.2.0",
-                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+                          "from": "punycode@>=0.2.0"
                         }
                       }
                     },
@@ -280,19 +274,16 @@
                         "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"
+                              "from": "delayed-stream@0.0.5"
                             }
                           }
                         },
                         "async": {
                           "version": "0.9.0",
-                          "from": "async@~0.9.0",
-                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
+                          "from": "async@~0.9.0"
                         }
                       }
                     },
@@ -325,12 +316,10 @@
                     "hawk": {
                       "version": "1.0.0",
                       "from": "hawk@~1.0.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
                       "dependencies": {
                         "hoek": {
                           "version": "0.9.1",
-                          "from": "hoek@0.9.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                          "from": "hoek@0.9.x"
                         },
                         "boom": {
                           "version": "0.4.2",
@@ -355,12 +344,10 @@
                 "srs": {
                   "version": "0.4.6",
                   "from": "srs@~0.4.1",
-                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.4.1",
-                      "from": "nan@~1.4.1",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
+                      "from": "nan@~1.4.1"
                     },
                     "node-pre-gyp": {
                       "version": "0.6.1",
@@ -774,12 +761,10 @@
                 "zipfile": {
                   "version": "0.5.4",
                   "from": "zipfile@~0.5.2",
-                  "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.4.1",
-                      "from": "nan@~1.4.1",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
+                      "from": "nan@~1.4.1"
                     },
                     "node-pre-gyp": {
                       "version": "0.6.1",
@@ -1193,12 +1178,10 @@
                 "sqlite3": {
                   "version": "2.2.7",
                   "from": "sqlite3@2.x",
-                  "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.1.2",
-                      "from": "nan@1.1.2",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+                      "from": "nan@1.1.2"
                     },
                     "node-pre-gyp": {
                       "version": "0.5.22",
@@ -1576,8 +1559,7 @@
                 },
                 "mime": {
                   "version": "1.2.11",
-                  "from": "mime@~1.2.9",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+                  "from": "mime@~1.2.9"
                 },
                 "mkdirp": {
                   "version": "0.3.5",
@@ -1586,7 +1568,6 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
-                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -1605,46 +1586,38 @@
         "express": {
           "version": "2.5.11",
           "from": "express@~2.5.11",
-          "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz",
           "dependencies": {
             "connect": {
               "version": "1.9.2",
               "from": "connect@1.x",
-              "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz",
               "dependencies": {
                 "formidable": {
                   "version": "1.0.15",
-                  "from": "formidable@1.0.x",
-                  "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz"
+                  "from": "formidable@1.0.x"
                 }
               }
             },
             "mime": {
               "version": "1.2.4",
-              "from": "mime@1.2.4",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"
+              "from": "mime@1.2.4"
             },
             "qs": {
               "version": "0.4.2",
-              "from": "qs@0.4.x",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"
+              "from": "qs@0.4.x"
             },
             "mkdirp": {
               "version": "0.3.0",
-              "from": "mkdirp@0.3.0",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
+              "from": "mkdirp@0.3.0"
             }
           }
         },
         "tilelive": {
           "version": "4.5.3",
           "from": "tilelive@~4.5.3",
-          "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
-              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -1673,8 +1646,7 @@
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@~1.2.11",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+              "from": "mime@~1.2.11"
             },
             "sphericalmercator": {
               "version": "1.0.2",
@@ -1683,9 +1655,9 @@
           }
         },
         "mapnik": {
-          "version": "1.4.15",
-          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
-          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
+          "version": "1.4.15-cdb1",
+          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
+          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
           "dependencies": {
             "nan": {
               "version": "1.2.0",
@@ -1693,13 +1665,11 @@
             },
             "mapnik-vector-tile": {
               "version": "0.5.5",
-              "from": "mapnik-vector-tile@0.5.5",
-              "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz"
+              "from": "mapnik-vector-tile@0.5.5"
             },
             "node-pre-gyp": {
               "version": "0.5.25",
               "from": "node-pre-gyp@0.5.25",
-              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz",
               "dependencies": {
                 "nopt": {
                   "version": "3.0.1",
@@ -2089,8 +2059,7 @@
                 },
                 "nan": {
                   "version": "1.1.2",
-                  "from": "nan@~1.1.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+                  "from": "nan@~1.1.0"
                 }
               }
             }
@@ -2103,18 +2072,15 @@
           "dependencies": {
             "underscore": {
               "version": "1.4.4",
-              "from": "underscore@~1.4.3",
-              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
+              "from": "underscore@~1.4.3"
             },
             "mapnik-reference": {
               "version": "5.0.9",
-              "from": "mapnik-reference@~5.0.7",
-              "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
+              "from": "mapnik-reference@~5.0.7"
             },
             "xml2js": {
               "version": "0.2.8",
               "from": "xml2js@~0.2.4",
-              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
               "dependencies": {
                 "sax": {
                   "version": "0.5.8",
@@ -2125,7 +2091,6 @@
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
-              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -2146,13 +2111,11 @@
         },
         "torque.js": {
           "version": "2.2.0",
-          "from": "torque.js@~2.2.0",
-          "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz"
+          "from": "torque.js@~2.2.0"
         },
         "node-statsd": {
           "version": "0.0.7",
-          "from": "node-statsd@~0.0.7",
-          "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
+          "from": "node-statsd@~0.0.7"
         }
       }
     }
diff --git a/package.json b/package.json
index 7636aee2..34b7312f 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",

From 839f8b062b5ddaf8d0c801fc110128ea6f229e77 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 11 Dec 2014 10:12:40 +0100
Subject: [PATCH 13/22] Changes to windshaft tagged version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34b7312f..d5caba8a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",

From 25f7e58b3ae57b0c69deeb4fe90770d7a550ee3b Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 11 Dec 2014 10:16:05 +0100
Subject: [PATCH 14/22] Re-generate npm-shrinkwrap.json

---
 npm-shrinkwrap.json | 114 +++++++++++++++++++++++++++++---------------
 1 file changed, 76 insertions(+), 38 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 8e7d6d09..d83ab933 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -52,7 +52,8 @@
                 },
                 "nan": {
                   "version": "1.1.2",
-                  "from": "nan@~1.1.0"
+                  "from": "nan@~1.1.0",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
                 }
               }
             }
@@ -82,8 +83,7 @@
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1",
-              "from": "core-util-is@~1.0.0",
-              "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
+              "from": "core-util-is@~1.0.0"
             },
             "isarray": {
               "version": "0.0.1",
@@ -92,8 +92,7 @@
             },
             "string_decoder": {
               "version": "0.10.31",
-              "from": "string_decoder@~0.10.x",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+              "from": "string_decoder@~0.10.x"
             },
             "inherits": {
               "version": "2.0.1",
@@ -105,8 +104,7 @@
     },
     "lzma": {
       "version": "1.3.7",
-      "from": "lzma@~1.3.7",
-      "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz"
+      "from": "lzma@~1.3.7"
     },
     "node-varnish": {
       "version": "0.3.0",
@@ -136,7 +134,8 @@
             },
             "nan": {
               "version": "1.1.2",
-              "from": "nan@~1.1.0"
+              "from": "nan@~1.1.0",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
             }
           }
         }
@@ -150,16 +149,15 @@
     "rollbar": {
       "version": "0.3.13",
       "from": "rollbar@~0.3.13",
-      "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-0.3.13.tgz",
       "dependencies": {
         "node-uuid": {
           "version": "1.4.2",
-          "from": "node-uuid@1.4.x"
+          "from": "node-uuid@1.4.x",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
         },
         "lru-cache": {
           "version": "2.2.4",
-          "from": "lru-cache@~2.2.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"
+          "from": "lru-cache@~2.2.1"
         },
         "json-stringify-safe": {
           "version": "5.0.0",
@@ -173,12 +171,13 @@
     },
     "underscore": {
       "version": "1.6.0",
-      "from": "underscore@~1.6.0"
+      "from": "underscore@~1.6.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
       "version": "0.32.2",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -197,15 +196,18 @@
               "dependencies": {
                 "underscore": {
                   "version": "1.4.4",
-                  "from": "underscore@~1.4.3"
+                  "from": "underscore@~1.4.3",
+                  "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
                 },
                 "mapnik-reference": {
                   "version": "5.0.9",
-                  "from": "mapnik-reference@~5.0.7"
+                  "from": "mapnik-reference@~5.0.7",
+                  "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
                 },
                 "xml2js": {
                   "version": "0.2.8",
                   "from": "xml2js@~0.2.4",
+                  "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
                   "dependencies": {
                     "sax": {
                       "version": "0.5.8",
@@ -216,6 +218,7 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -232,6 +235,7 @@
             "millstone": {
               "version": "0.6.14",
               "from": "millstone@0.6.14",
+              "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.14.tgz",
               "dependencies": {
                 "generic-pool": {
                   "version": "2.0.4",
@@ -240,6 +244,7 @@
                 "request": {
                   "version": "2.34.0",
                   "from": "request@~2.34.0",
+                  "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz",
                   "dependencies": {
                     "qs": {
                       "version": "0.6.6",
@@ -255,7 +260,8 @@
                     },
                     "node-uuid": {
                       "version": "1.4.2",
-                      "from": "node-uuid@~1.4.0"
+                      "from": "node-uuid@~1.4.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
                     },
                     "tough-cookie": {
                       "version": "0.12.1",
@@ -263,7 +269,8 @@
                       "dependencies": {
                         "punycode": {
                           "version": "1.3.2",
-                          "from": "punycode@>=0.2.0"
+                          "from": "punycode@>=0.2.0",
+                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                         }
                       }
                     },
@@ -274,16 +281,19 @@
                         "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"
+                              "from": "delayed-stream@0.0.5",
+                              "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                             }
                           }
                         },
                         "async": {
                           "version": "0.9.0",
-                          "from": "async@~0.9.0"
+                          "from": "async@~0.9.0",
+                          "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
                         }
                       }
                     },
@@ -316,10 +326,12 @@
                     "hawk": {
                       "version": "1.0.0",
                       "from": "hawk@~1.0.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
                       "dependencies": {
                         "hoek": {
                           "version": "0.9.1",
-                          "from": "hoek@0.9.x"
+                          "from": "hoek@0.9.x",
+                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
                         },
                         "boom": {
                           "version": "0.4.2",
@@ -344,10 +356,12 @@
                 "srs": {
                   "version": "0.4.6",
                   "from": "srs@~0.4.1",
+                  "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.4.1",
-                      "from": "nan@~1.4.1"
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
                     "node-pre-gyp": {
                       "version": "0.6.1",
@@ -761,10 +775,12 @@
                 "zipfile": {
                   "version": "0.5.4",
                   "from": "zipfile@~0.5.2",
+                  "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.4.1",
-                      "from": "nan@~1.4.1"
+                      "from": "nan@~1.4.1",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz"
                     },
                     "node-pre-gyp": {
                       "version": "0.6.1",
@@ -1178,10 +1194,12 @@
                 "sqlite3": {
                   "version": "2.2.7",
                   "from": "sqlite3@2.x",
+                  "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz",
                   "dependencies": {
                     "nan": {
                       "version": "1.1.2",
-                      "from": "nan@1.1.2"
+                      "from": "nan@1.1.2",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
                     },
                     "node-pre-gyp": {
                       "version": "0.5.22",
@@ -1559,7 +1577,8 @@
                 },
                 "mime": {
                   "version": "1.2.11",
-                  "from": "mime@~1.2.9"
+                  "from": "mime@~1.2.9",
+                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
                 },
                 "mkdirp": {
                   "version": "0.3.5",
@@ -1568,6 +1587,7 @@
                 "optimist": {
                   "version": "0.6.1",
                   "from": "optimist@~0.6.0",
+                  "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.2",
@@ -1586,38 +1606,46 @@
         "express": {
           "version": "2.5.11",
           "from": "express@~2.5.11",
+          "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz",
           "dependencies": {
             "connect": {
               "version": "1.9.2",
               "from": "connect@1.x",
+              "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz",
               "dependencies": {
                 "formidable": {
                   "version": "1.0.15",
-                  "from": "formidable@1.0.x"
+                  "from": "formidable@1.0.x",
+                  "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz"
                 }
               }
             },
             "mime": {
               "version": "1.2.4",
-              "from": "mime@1.2.4"
+              "from": "mime@1.2.4",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"
             },
             "qs": {
               "version": "0.4.2",
-              "from": "qs@0.4.x"
+              "from": "qs@0.4.x",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"
             },
             "mkdirp": {
               "version": "0.3.0",
-              "from": "mkdirp@0.3.0"
+              "from": "mkdirp@0.3.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
             }
           }
         },
         "tilelive": {
           "version": "4.5.3",
           "from": "tilelive@~4.5.3",
+          "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -1646,11 +1674,12 @@
             },
             "mime": {
               "version": "1.2.11",
-              "from": "mime@~1.2.11"
+              "from": "mime@~1.2.11",
+              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "sphericalmercator": {
               "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.2"
+              "from": "sphericalmercator@~1.0.1"
             }
           }
         },
@@ -1665,11 +1694,13 @@
             },
             "mapnik-vector-tile": {
               "version": "0.5.5",
-              "from": "mapnik-vector-tile@0.5.5"
+              "from": "mapnik-vector-tile@0.5.5",
+              "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz"
             },
             "node-pre-gyp": {
               "version": "0.5.25",
               "from": "node-pre-gyp@0.5.25",
+              "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz",
               "dependencies": {
                 "nopt": {
                   "version": "3.0.1",
@@ -2059,7 +2090,8 @@
                 },
                 "nan": {
                   "version": "1.1.2",
-                  "from": "nan@~1.1.0"
+                  "from": "nan@~1.1.0",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
                 }
               }
             }
@@ -2072,15 +2104,18 @@
           "dependencies": {
             "underscore": {
               "version": "1.4.4",
-              "from": "underscore@~1.4.3"
+              "from": "underscore@~1.4.3",
+              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
             },
             "mapnik-reference": {
               "version": "5.0.9",
-              "from": "mapnik-reference@~5.0.7"
+              "from": "mapnik-reference@~5.0.7",
+              "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
             },
             "xml2js": {
               "version": "0.2.8",
               "from": "xml2js@~0.2.4",
+              "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
               "dependencies": {
                 "sax": {
                   "version": "0.5.8",
@@ -2091,6 +2126,7 @@
             "optimist": {
               "version": "0.6.1",
               "from": "optimist@~0.6.0",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2",
@@ -2111,11 +2147,13 @@
         },
         "torque.js": {
           "version": "2.2.0",
-          "from": "torque.js@~2.2.0"
+          "from": "torque.js@~2.2.0",
+          "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz"
         },
         "node-statsd": {
           "version": "0.0.7",
-          "from": "node-statsd@~0.0.7"
+          "from": "node-statsd@~0.0.7",
+          "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz"
         }
       }
     }

From 1a9bc5550cf4ade378d63e7c8a3a2dea5fc4e00c Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 11 Dec 2014 10:17:12 +0100
Subject: [PATCH 15/22] Make windshaft version visible in news

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

diff --git a/NEWS.md b/NEWS.md
index eddc88a7..f44f3ca3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 --------------------
 
 Announcements:
- - Upgrades windshaft to upgrade-mapnik branch
+ - Upgrades windshaft to 0.32.2
 
 Bugfixes:
  - Closes fd for log files on `kill -HUP` (#230)

From 0453166326fea7262ffb77f802b19d39d3b5cf24 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 11 Dec 2014 10:22:56 +0100
Subject: [PATCH 16/22] Release 1.21.1

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

diff --git a/NEWS.md b/NEWS.md
index f44f3ca3..1d5a7449 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-1.21.1 -- 2014-mm-dd
+1.21.1 -- 2014-12-11
 --------------------
 
 Announcements:

From e9383a2f0c649db62f44fcf80ee373781cb13fe7 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 11 Dec 2014 10:24:22 +0100
Subject: [PATCH 17/22] Stubs next version

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

diff --git a/NEWS.md b/NEWS.md
index 1d5a7449..e1613e13 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+1.21.2 -- 2014-mm-dd
+--------------------
+
+
 1.21.1 -- 2014-12-11
 --------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d83ab933..2bd258c1 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index d5caba8a..73f8e3b2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.21.1",
+    "version": "1.21.2",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 3f66c20616d655d5889701b6818b15014c07f971 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 15 Dec 2014 16:05:58 +0100
Subject: [PATCH 18/22] Upgrades windshaft to 0.32.4

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

diff --git a/NEWS.md b/NEWS.md
index e1613e13..66a4c90b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,9 @@
 1.21.2 -- 2014-mm-dd
 --------------------
 
+Announcements:
+ - Upgrades windshaft to 0.32.4
+
 
 1.21.1 -- 2014-12-11
 --------------------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 2bd258c1..90941597 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -96,7 +96,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2"
             }
           }
         }
@@ -175,9 +175,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.32.2",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
-      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
+      "version": "0.32.4",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
+      "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -315,7 +315,8 @@
                         },
                         "ctype": {
                           "version": "0.5.2",
-                          "from": "ctype@0.5.2"
+                          "from": "ctype@0.5.2",
+                          "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
                         }
                       }
                     },
@@ -1658,8 +1659,9 @@
               }
             },
             "sphericalmercator": {
-              "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.1"
+              "version": "1.0.3",
+              "from": "sphericalmercator@~1.0.1",
+              "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz"
             }
           }
         },
@@ -1678,8 +1680,9 @@
               "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
             },
             "sphericalmercator": {
-              "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.1"
+              "version": "1.0.3",
+              "from": "sphericalmercator@~1.0.1",
+              "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz"
             }
           }
         },
diff --git a/package.json b/package.json
index 73f8e3b2..87b616ac 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.2",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",

From e1d7852877ca8c90c0c4dcfd95a6d6478ef4cbfe Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 15 Dec 2014 16:07:00 +0100
Subject: [PATCH 19/22] Release 1.21.2

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

diff --git a/NEWS.md b/NEWS.md
index 66a4c90b..52bf73f2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-1.21.2 -- 2014-mm-dd
+1.21.2 -- 2014-12-15
 --------------------
 
 Announcements:

From 72cf5f8b04c519be6daa1fe2561360a826836f46 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 15 Dec 2014 16:08:18 +0100
Subject: [PATCH 20/22] Stubs next version

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

diff --git a/NEWS.md b/NEWS.md
index 52bf73f2..b08ff5c5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+1.21.3 -- 2014-mm-dd
+--------------------
+
+
 1.21.2 -- 2014-12-15
 --------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 90941597..e9f2e030 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.21.2",
+  "version": "1.21.3",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index 87b616ac..59c704a2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.21.2",
+    "version": "1.21.3",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 902b7339d14eca137a83d8f6f606ff8397e0d3fb Mon Sep 17 00:00:00 2001
From: Andy Eschbacher <andy.eschbacher@gmail.com>
Date: Wed, 17 Dec 2014 15:31:18 -0500
Subject: [PATCH 21/22] Fixed typos, etc.

---
 docs/Map-API-internal.md |  6 +++---
 docs/Map-API.md          | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/docs/Map-API-internal.md b/docs/Map-API-internal.md
index 0956f271..5e94ba92 100644
--- a/docs/Map-API-internal.md
+++ b/docs/Map-API-internal.md
@@ -1,6 +1,6 @@
 # Kind of maps
 
-Windshaft-CartoDB supports these kind of maps:
+Windshaft-CartoDB supports the following types of maps:
 
  - [Temporary maps](#temporary-maps) (created by anyone)
    - [Detached maps](#detached-maps)
@@ -12,14 +12,14 @@ Windshaft-CartoDB supports these kind of maps:
 ## Temporary maps
 
 Temporary maps have no owners and are anonymous in nature.
-There are two kind of temporary maps:
+There are two kinds of temporary maps:
 
  - Detached maps (aka MultiLayer-API)
  - Inline maps 
 
 ### Detached maps
 
-Detached maps are maps which are configured with a request
+Detached maps are maps that are configured with a request
 obtaining a temporary token and then used by referencing
 the obtained token. The token expires automatically when unused.
 
diff --git a/docs/Map-API.md b/docs/Map-API.md
index fb2a8066..02fd3f95 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -1,6 +1,6 @@
 ## Maps API
 
-The CartoDB Maps API allows you to generate maps based on data hosted in your CartoDB account and style them using CartoCSS. The API generates a XYZ based URL to fetch Web Mercator projected tiles using web clients like Leaflet, Google Maps, OpenLayers.
+The CartoDB Maps API allows you to generate maps based on data hosted in your CartoDB account, and you can apply custom SQL and CartoCSS to the data. The API generates a XYZ-based URL to fetch Web Mercator projected tiles using web clients such as [Leaflet](http://leafletjs.com), [Google Maps](https://developers.google.com/maps/), or [OpenLayers](http://openlayers.org/).
 
 You can create two types of maps with the Maps API:
 
@@ -8,7 +8,7 @@ You can create two types of maps with the Maps API:
   Maps that can be created using your CartoDB public data. Any client can change the read-only SQL and CartoCSS parameters that generate the map tiles. These maps can be created from a JavaScript application alone and no authenticated calls are needed. See [this CartoDB.js example]({{ '/cartodb-platform/cartodb-js.html' | prepend: site.baseurl }}).
 
 - **Named maps**  
-  Maps that access to your private data. These maps require an owner to setup and modify any SQL and CartoCSS parameters and are not modifiable without new setup calls. 
+  Maps that have access to your private data. These maps require an owner to setup and modify any SQL and CartoCSS parameters and are not modifiable without new setup calls. 
 
 ## Quickstart
 
@@ -37,7 +37,7 @@ $.ajax({
   url: 'http://documentation.cartodb.com/api/v1/map',
   data: JSON.stringify(mapconfig),
   success: function(data) {
-    var templateUrl = 'http://documentation.cartodb.com/api/v1/map/' + data.layergroupid + '{z}/{x}/{y}.png'
+    var templateUrl = 'http://documentation.cartodb.com/api/v1/map/' + data.layergroupid + '/{z}/{x}/{y}.png'
     console.log(templateUrl);
   }
 })
@@ -46,10 +46,9 @@ $.ajax({
 ### Named maps
 
 Let's create a named map using some private tables in a CartoDB account.
-The following API call creates a map of European countries that have a white fill color:
+The following map config sets up a map of European countries that have a white fill color:
 
 ```javascript
-// mapconfig.json
 {
   "version": "0.0.1",
   "name": "test",
@@ -69,7 +68,7 @@ The following API call creates a map of European countries that have a white fil
 }
 ```
 
-The map config needs to be sent to CartoDB's Map API using an authenticated call. Here we use a command line tool called `curl`. For more info about this tool see [this blog post](http://quickleft.com/blog/command-line-tutorials-curl) or type ``man curl`` in bash. Using `curl` the call would look like:
+The map config needs to be sent to CartoDB's Map API using an authenticated call. Here we will use a command line tool called `curl`. For more info about this tool, see [this blog post](http://quickleft.com/blog/command-line-tutorials-curl), or type ``man curl`` in bash. Using `curl`, and storing the config from above in a file `mapconfig.json`, the call would look like:
 
 <div class="code-title notitle code-request"></div>
 ```bash
@@ -106,7 +105,7 @@ The following concepts are the same for every endpoint in the API except when it
 
 ### Auth
 
-By default, users do not have access to private tables in CartoDB. In order to instantiate a map from private table data an API Key is required. Additionally, to include some endpoints an API Key must be included (e.g. creating a named map).
+By default, users do not have access to private tables in CartoDB. In order to instantiate a map from private table data, an API Key is required. Additionally, to include some endpoints, an API Key must be included (e.g. creating a named map).
 
 To execute an authorized request, api_key=YOURAPIKEY should be added to the request URL. The param can be also passed as POST param. We **strongly advise** using HTTPS when you are performing requests that include your `api_key`.
 
@@ -270,7 +269,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 but the mapconfig is stored in the server and given a unique name. Two other big differences are that you can created 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 that 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:
 
@@ -278,7 +277,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 con modify the map 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).
 
@@ -335,18 +334,18 @@ POST /api/v1/map/named
 
 ##### Arguments
 
-- **name**: there can be at most 1 template with the same name for any user valid names start with a letter and only contains letter, numbers or underscores
+- **name**: There can be at most _one_ template with the same name for any user. Valid names start with a letter, and only contain letters, numbers, or underscores (_).
 - **auth**:
-  - **method** `"token"` or `"open"` (the default if no `"method"` is given)
-  - **valid_tokens** when `"method"` is set to `"token"` these tokens will allow to instantiate the named map
+  - **method** `"token"` or `"open"` (the default if no `"method"` is given).
+  - **valid_tokens** when `"method"` is set to `"token"`, the values listed here allow you to instantiate the named map.
 - **placeholders**: Variables not listed here are not substituted. Variable not provided at instantiation time trigger an error. A default is required for optional variables. Type specification is used for quoting, to avoid injections see template format section below.
-- **layergroup**: the layer list definition. This is the MapConfig explained in anonymous maps see https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.1.0.md
+- **layergroup**: the layer list definition. This is the MapConfig explained in anonymous maps. See [MapConfig documentation](https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.1.0.md) for more info.
 
 #### Template Format
 
-A templated `layergroup` allows using placeholders in the "cartocss" and "sql" elements of the "option" object in any "layer" of a layergroup configuration
+A templated `layergroup` allows the use of placeholders in the "cartocss" and "sql" elements of the "option" object in any "layer" of a `layergroup` configuration
 
-Valid placeholder names start with a letter and can only contain letters, numbers or underscores. They have to be written between `<%=` and `%>` strings in order to be replaced.
+Valid placeholder names start with a letter and can only contain letters, numbers, or underscores. They have to be written between the `<%=` and `%>` strings in order to be replaced.
 
 ##### Example
 

From cd585dd657ca59ba01ccf7cb031770c14bf1fc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= <matallo@gmail.com>
Date: Tue, 23 Dec 2014 14:06:02 +0100
Subject: [PATCH 22/22] Update Map-API.md

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

diff --git a/docs/Map-API.md b/docs/Map-API.md
index 02fd3f95..045446cf 100644
--- a/docs/Map-API.md
+++ b/docs/Map-API.md
@@ -379,7 +379,7 @@ curl -X POST \
 <div class="code-title">RESPONSE</div>
 ```javascript
 {
-  "templateid":"name",
+  "template_id":"name",
 }
 ```