Merge branch 'standalone-server' into standalone-server-mvt

Conflicts:
	npm-shrinkwrap.json
	package.json

package.json

@@ -29,9 +29,9 @@
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
         "windshaft": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations-mvt",
-        "step": "~0.0.5",
+        "step": "~0.0.6",
         "queue-async": "~1.0.7",
-        "request": "~2.9.203",
+        "request": "~2.62.0",
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
@@ -43,7 +43,7 @@
     "devDependencies": {
         "istanbul": "~0.3.6",
         "mocha": "~1.21.4",
-        "nock": "~1.3.0",
+        "nock": "~2.11.0",
         "jshint": "~2.6.0",
         "redis": "~0.8.6",
         "strftime": "~0.8.2",