lots of minor changes
Merge branch 'master' of github.com:bananagranola/dotfiles