update port() method to docker 0.6.5+
workaround for port lookup
Correctly decode the logs stream and support stdout/stderr filtering

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
Code style fixes

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
Merge remote-tracking branch 'dotcloud/master'
fix https ping bug
Merge branch 'logs-encoding' of https://github.com/mpetazzoni/docker-py
Merge remote-tracking branch 'dotcloud/master'
added memory swap limit support
added diskquota parameter
Merge conflicts fixed
Port conflicts fixed
changed requirements to equal or greater
tutum-docker-py 0.3.0
bug fix
bug fix (comma)
fix merge
Merge branch 'master' into staging

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