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/integration/testcases.py

@@ -10,7 +10,7 @@ class DockerClientTestCase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.client = Client(docker_url())
-        cls.client.pull('ubuntu', tag='latest')
+        cls.client.pull('busybox', tag='latest')
 
     def setUp(self):
         for c in self.client.containers(all=True):
@@ -28,7 +28,7 @@ class DockerClientTestCase(unittest.TestCase):
             project='figtest',
             name=name,
             client=self.client,
-            image="ubuntu",
+            image="busybox:latest",
             **kwargs
         )