Allow overriding environements on command line

Add a new command line option -e to override environement variables when
running a service.

Signed-off-by: Chmouel Boudjnah <chmouel@chmouel.com>
Merge pull request #529 from chmouel/override-environement

Allow overriding environements on command line
TLS support, with same env vars as docker client

Thanks to @jkingyens for the bulk of the work.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7

Include TLS fixes and relative imports:

https://github.com/aanand/dockerpty/commit/c8b493553477c9a57d163c71c97b2102f44a6ce7

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Ship 1.0.0

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Update documentation for TLS and boot2docker

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Update docker-py to 0.5.3

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Merge pull request #537 from aanand/tls

TLS support
Merge pull request #526 from bfirsh/ship-1.0.0

WIP: Ship 1.0.0
Fix docker-py requirement in setup.py

I updated requirements.txt but forgot about setup.py, so the version on
pypi is broken for people who already have docker-py 0.5.0 installed.

Closes #547.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Credit 1.0 contributors

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Fix date on 1.0.0 change notes

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Merge pull request #549 from aanand/credit-1.0-contributors

Credit 1.0 contributors
Merge pull request #550 from bfirsh/fix-date-on-change-notes

Fix date on 1.0.0 change notes
Resolves #553, Resolves #546 - bug fixes with unit tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Merge pull request #548 from aanand/fix-docker-py-requirement

Fix docker-py requirement in setup.py
Merge pull request #554 from dnephin/more_defensive_stream

Fix a couple bugs with 1.0 release and Docker 1.3
Merge branch 'master' of github.com:docker/fig

Conflicts:
	fig/__init__.py