Merge remote-tracking branch 'upstream/master' into feature/auto_start

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py

tests/fixtures/links-figfile/fig.yml

@@ -1,11 +1,11 @@
 db:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
 web:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300
   links:
     - db:db
 console:
-  image: ubuntu
+  image: busybox:latest
   command: /bin/sleep 300