buncha stuff
Merge branch 'master' of github.com:paulbdavis/dotfiles