Bah, no one needs to know my real name
Merge branch 'master' of https://github.com/jdavis/dotfiles