update some stuff
Merge branch 'master' of github.com:coreypurcell/dotfiles