Merge branch 'work'
Merge branch 'master' of github.com:michaelgruber/dotfiles
merged in work changes