Upgraded docker-compose.yaml file format from 1 to 3.4

This allows us to set logging options, which weren't available in version 1.
I've also added newlines around each service definition, and made the
formatting consistent across the entire file (using align-yaml, one of the
tools of the atom-beautify plugin for Atom).

docker/docker-compose.yml

@@ -1,3 +1,5 @@
+version:                       '3.4'
+services:
   mongo:
     image:                     mongo:3.4.2
     container_name:            mongo
@@ -7,18 +9,21 @@ mongo:
      - /data/storage/db-bak:/data/db-bak # for backing up stuff etc.
     ports:
      - "127.0.0.1:27017:27017"
+
   redis:
     image:                     redis:3.2.8
     container_name:            redis
     restart:                   always
     ports:
      - "127.0.0.1:6379:6379"
+
   rabbit:
       image:                   rabbitmq:3.6.10
       container_name:          rabbit
       restart:                 always
       ports:
           - "127.0.0.1:5672:5672"
+
   elastic:
       image:                   armadillica/elasticsearch:latest
       container_name:          elastic
@@ -30,6 +35,7 @@ elastic:
           - "127.0.0.1:9200:9200"
       environment:
           ES_JAVA_OPTS:        "-Xms256m -Xmx256m"
+
   elasticproxy:
       image:                   armadillica/elasticproxy:latest
       container_name:          elasticproxy
@@ -37,6 +43,7 @@ elasticproxy:
       command:                 /elasticproxy -elastic http://elastic:9200/
       links:
           - elastic
+
   kibana:
       image:                   armadillica/kibana:latest
       container_name:          kibana
@@ -53,6 +60,7 @@ kibana:
           NODE_OPTIONS:        "--max-old-space-size=200"
       links:
           - elasticproxy
+
   blender_cloud:
     image:                     armadillica/blender_cloud:latest
     container_name:            blender_cloud
@@ -72,6 +80,7 @@ blender_cloud:
      - mongo
      - redis
      - rabbit
+
   celery_worker:
     image:                     armadillica/blender_cloud:latest
     entrypoint:                /celery-worker.sh
@@ -87,6 +96,7 @@ celery_worker:
      - mongo
      - redis
      - rabbit
+
   celery_beat:
     image:                     armadillica/blender_cloud:latest
     entrypoint:                /celery-beat.sh
@@ -101,6 +111,7 @@ celery_beat:
      - mongo
      - redis
      - rabbit
+
   # notifserv:
   #   container_name:          notifserv
   #   image:                   armadillica/pillar-notifserv:cd8fa678436563ac3b800b2721e36830c32e4656
@@ -111,6 +122,7 @@ celery_beat:
   #    VIRTUAL_HOST:           https://cloud.blender.org/notifications*,http://pillar-web/notifications*
   #    VIRTUAL_HOST_WEIGHT:    20
   #    FORCE_SSL:              true
+
   grafista:
     image:                     armadillica/grafista:latest
     container_name:            grafista
@@ -118,6 +130,7 @@ grafista:
     volumes:
       - /data/git/grafista:/data/git/grafista:ro
       - /data/storage/grafista:/data/storage/grafista
+
   letsencrypt:
       image:                   armadillica/picohttp:latest
       container_name:          letsencrypt
@@ -129,6 +142,7 @@ letsencrypt:
           VIRTUAL_HOST_WEIGHT: 20
       volumes:
           - /data/letsencrypt:/data/letsencrypt
+
   haproxy:
     image:                     dockercloud/haproxy:1.5.3
     container_name:            haproxy