Merge branch '0.3' into develop

Conflicts:
	Makefile
	requirements-dev.txt

requirements-docker.txt

@@ -1,7 +1,7 @@
 -e .[docker]
 appdirs==1.4.3
 bonobo-docker==0.2.5
-bonobo==0.3.1
+bonobo==0.3.2
 certifi==2017.4.17
 chardet==3.0.4
 colorama==0.3.9
@@ -10,10 +10,8 @@ docker==2.3.0
 enum34==1.1.6
 fs==2.0.3
 idna==2.5
-packaging==16.8
 pbr==3.0.1
 psutil==5.2.2
-pyparsing==2.2.0
 pytz==2017.2
 requests==2.17.3
 six==1.10.0