Merge branch 'master' into cmg-csh-ho-docker-spelling

services/spelling/config/settings.defaults.coffee

@@ -5,11 +5,6 @@ module.exports = Settings =
 		spelling:
 			port: 3005
 			host: process.env["LISTEN_ADDRESS"] or "localhost"
-			
-	redis:
-		port: process.env['REDIS_PORT']
-		host: process.env["REDIS_HOST"] or "localhost"
-		password: process.env["REDIS_PASSWORD"] or ""
 		
 	mongo:
 		url: process.env['MONGO_CONNECTION_STRING'] or "mongodb://#{process.env["MONGO_HOST"] or "localhost"}/sharelatex"