Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements

Conflicts:
	docker/client.py
	docker/unixconn/unixconn.py
	tests/integration_test.py