More changes to git config.
Merge branch 'master' of https://github.com/gmbuell/.dotfiles