merged with develop

run_tests.sh

@@ -76,7 +76,7 @@ fi
 PATH=node_modules/.bin/:$PATH
 
 echo "Running tests"
-mocha -u tdd ${MOCHA_OPTS} ${TESTS}
+mocha -t 10000 -u tdd ${MOCHA_OPTS} ${TESTS}
 ret=$?
 
 cleanup

test/acceptance/server.js

@@ -16,7 +16,6 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 server.setMaxListeners(0);
 
-
 suite('server', function() {
 
     var redis_client = redis.createClient(global.environment.redis.port);