Fix the gitconfig
Merge branch 'master' of https://github.com/paulkiernan/dotfiles