Conflicts:
	docker/utils/__init__.py
	docker/utils/utils.py
	tests/utils_test.py

Make history() return json.

Conflicts:
	docker/client.py
	tests/fake_api.py

Added tail behaviour to logs command, same as CLI v1.3 (latest)

Fixed socket for PY3 - Fixes #342

When docker is stopped, docker-py receive a empty string

Clear UNIX connections pool to avoid ResourceWarnings

Up to TLS 1.2, support the highest locally supported crypto
protocol. This eliminates the previous default of PROTOCOL_SSLv23,
replacing it with what should be TLSv1 for Python 2.7 and TLSv1.2
for newer versions of Python 3.

Developers using docker-py may still specify the ssl_version to
override the default.
Signed-off-by: Eric Windisch <eric@windisch.us>

Add tests to sdist.

Add tests to sdist.

utils: add kwargs_from_env

Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py

Add Makefile for running tests in Docker

Conflicts:
	README.md

Conflicts:
	README.md

Add support for 'cpuset'

Add directories to the Docker context

Added markdown docs for #83

* Fixed broken Dockerfile
* added .dockerignore