CHG: update dotfiles
Merge branch 'master' of https://github.com/manuw/dotfiles