Merge remote-tracking branch 'Felix/master'

# Conflicts:
#	package-lock.json

Author: AJCStriker

.travis.yml

@@ -3,6 +3,7 @@ node_js:
 - '8'
 services:
 - postgresql
+- redis-server
 before_install:
 - npm install -g npm@6
 - npm install -g greenkeeper-lockfile@1

docker-compose.yml

@@ -10,4 +10,9 @@ services:
         volumes:
           - ./.pg_data:/var/lib/postgresql/data
         ports:
-          - 5432:5432
+          - 5432:5432
+
+    redis:
+        image: redis:5.0.3-alpine
+        ports:
+          - 6379:6379