Use my global .gitconfig

My standard, global one can be found here: http://git.io/qKgvTQ
Merge branch 'master' of github.com:habi/GlobalDiagnostiX

Conflicts:
	.gitconfig