Add changes from work PC
Merge branch 'master' of https://github.com/mikedd/dotfiles