Merge branch 'master' into standalone-server

Conflicts:
	npm-shrinkwrap.json
	package.json

NEWS.md

@@ -1,10 +1,18 @@
 # Changelog
 
-## 2.7.3
+## 2.8.1
 
 Released 2015-mm-dd
 
 
+## 2.8.0
+
+Released 2015-07-15
+
+Announcements:
+ - Upgrades windshaft to [0.48.0](https://github.com/CartoDB/Windshaft/releases/tag/0.48.0)
+
+
 ## 2.7.2
 
 Released 2015-07-14

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.7.3",
+  "version": "2.8.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -173,14 +173,14 @@
                   "resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz"
                 },
                 "mime-types": {
-                  "version": "2.1.2",
+                  "version": "2.1.3",
                   "from": "mime-types@^2.1.1",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.14.0",
-                      "from": "mime-db@~1.14.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz"
+                      "version": "1.15.0",
+                      "from": "mime-db@~1.15.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"
                     }
                   }
                 }
@@ -444,7 +444,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@~2.0.1"
+              "from": "inherits@2"
             }
           }
         },

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.7.3",
+    "version": "2.8.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"