Separate fixups for my two OSes
Merge branch 'master' of github.com:ttsiodras/dotfiles