updated whatnot
Merge branch 'master' of github.com:zbtirrell/dotfiles