First working version without any dependency on docker source.

This version has extensive changes and should be checked thoroughly
against any branches.
remove temp file
Merge branch 'iansmith-better-dockerclient'
Manual merge conflict fix