Merge branch 'release/v2.0' into develop

Conflicts:
	NEWS.md

NEWS.md

@@ -2,8 +2,7 @@
 -----
 * Reduce default extent to allow for consistent proj4 round-tripping 
 
-
-1.1.3 (DD//MM//YY)
+1.1.3 (30//11//12)
 -----
 * Fix reset_styles script to really skip extended keys
 * CartoCSS versioning
@@ -20,7 +19,6 @@
   * styles with no semicolon
   * markers shift due to geometry clipping
 
-
 1.1.1 (DD//MM//YY)
 -----
 * Add support for persistent client cache headers

npm-shrinkwrap.json

@@ -182,7 +182,7 @@
       "version": "1.3.3"
     },
     "grainstore": {
-      "version": "0.10.7",
+      "version": "0.10.8",
       "dependencies": {
         "carto": {
           "version": "0.9.3-cdb2",

package.json

@@ -21,7 +21,7 @@
         "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "grainstore"  : "~0.10.7",
+        "grainstore"  : "~0.10.8",
         "windshaft"  : "~0.8.0",
         "step": "0.0.x",
         "generic-pool": "1.0.x",