Fixes to work with latest docker library

[eigood]

I did not write any of this code. This is a fork by someone else. I was not able to file an issue in the downstream repo to have him create the pull request, but was able to do so on his behalf.

This most likely will close #78 and #79.