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