Quick initial changes to let me run the tests in a docker container against Docker 1.2.0
Merge pull request #8 from SvenDowideit/initial-play

Quick initial changes to let me run the tests in a docker container against Docker 1.2.0