extra git fun
Merge branch 'master' of https://github.com/jdwelch/dotfiles