added docker and puppet modes
docker stuff
Merge branch 'master' of https://github.com/gujo/dotfiles