Update .gitconfig.
Merge branch 'master' of https://github.com/boardwalk/dotfiles

Conflicts:
	.gitconfig