Updated .gitconfig.
Merge branch 'master' of github.com:jk0/dotfiles