Merge remote-tracking branch 'origin' into copilot/fill-db-seeds-file

Author: mcfiredrill

docker-compose-dev.yml

@@ -60,15 +60,3 @@ services:
 
 volumes:
   postgres_data_9.4:
-
-# Defaults needed by Ubuntu for some reason
-networks:
-  default:
-    driver: bridge
-    driver_opts:
-      com.docker.network.driver.mtu: "1450"
-      com.docker.network.bridge.default_bridge: "true"
-      com.docker.network.bridge.enable_icc: "true"
-      com.docker.network.bridge.enable_ip_masquerade: "true"
-      com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-      com.docker.network.bridge.name: "docker0"