Merge branch 'named-maps-tiles' into standalone-server

Conflicts:
	app.js

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.5.1",
+    "version": "2.7.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -32,7 +32,7 @@
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
-        "redis-mpool": "~0.3.0",
+        "redis-mpool": "~0.4.0",
         "lzma": "~1.3.7",
         "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb"
     },