Merge pull request #2167 from TechEmpower/master

Merging master changes into round-14

frameworks/JavaScript/sailsjs/benchmark_config.json

@@ -28,7 +28,6 @@
       "setup_file": "setup",
       "db_url": "/postgres/db",
       "query_url": "/postgres/queries?queries=",
-      "fortune_url": "/postgres/fortunes",
       "update_url": "/postgres/updates?queries=",
       "port": 8080,
       "approach": "Realistic",

frameworks/JavaScript/sailsjs/setup.sh

@@ -10,6 +10,5 @@ sed -i 's|127.0.0.1|'"${DBHOST}"'|g' api/controllers/SequelizePostgresController
 npm install -g sails
 
 # reset cache & run app
-npm cache clean
 npm install
 sails lift --port 8080 &