lots of little fixes
Merge branch 'master' of github.com:benfleis/dotfiles