gitconfig: silence warning.
Merge branch 'master' of github.com:jmesmon/dotfiles

Conflicts:
	_.gitconfig