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

Conflicts:
	gitconfig