Differentiate a bit between work and not-work.
Merge branch 'master' of github.com:markjdb/dotfiles