new image naming scheme
Merge branch 'master' of github.com:ChristianKniep/docker-terminal