Updating duncombe/gitconfig_extras
Updating duncombe/gitconfig_extras
Merge branch 'master' of ssh://github/duncombe/dotfiles

Conflicts:
	duncombe/gitconfig_extras