changes from loaner laptop
Merge branch 'master' of https://github.com/hybernaut/dotfiles