My own git config.
Merge branch 'master' of https://github.com/JoeStanton/dotfiles
Merge branch 'master' of https://github.com/JoeStanton/dotfiles