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

The Dockerfile probably (sadly) will need to not container the `Build test` step - perhaps that should be the `CMD`, so the DOCKER_HOST` can be over-ridden.

I'll play a little more here and there, though I'm about to go camping for the week, so :)