fixed typo in readme (volume -> volumes)
Merge pull request #82 from tkrille/typo-in-readme

fixed typo in readme (volume -> volumes)
Merge pull request #81 from soby/timeout

typo in timeout exception
Simplify port status output and make unambigious without colors

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
added ugly wait period for bgtunnel to finish whatever it needs to do
added HttpRequestLifecycle

doc fix for TCP port pinger default timeout

updated per flake8 coding style requirements
Merge pull request #83 from soby/http_lifecycle

Added HTTPRequestLifecycle and short wait when using bgtunnel
Restart policy can be set

docker-py 0.5.0 required
it works only with docker > 1.2.0.
Merge pull request #78 from Teudimundo/restart-policy

Possibility to set restart policy from configuration file
Cleanups to restart policy code

Parameters for the restart policy are now 'name' and 'retries', and a
single, colon-separated string can also be used, like "on-failure:3".

Signed-off-by: Maxime Petazzoni <max@signalfuse.com>
Added TLS / SSL Support

Momer's original pull request, updated to reflect the changes in
docker.py / maestro-ng
Merge pull request #91 from grmble/master

 Added TLS / SSL Support
Merge branch 'master' of https://github.com/soby/maestro-ng

Conflicts:
	maestro/entities.py