memory swap limit support
disk quota support
Merge branch 'master' into staging

Conflicts:
	docker/client.py
	tests/test.py
Merge pull request #1 from tutumcloud/staging

Staging