Now based on jordi/docker-devel
Merge branch 'master' of github.com:jig/docker-docker