Compat with docker 0.11
Merge branch 'master' of https://github.com/aidanhs/dockerutil