lots of dotfiles cleanup
Merge branch 'master' of https://github.com/wilmoore/dotfiles