.gitconfig: color.ui, 4 space replace tab, vimrc: comment clang complete
Merge branch 'master' of https://github.com/u1240976/rcfiles

Conflicts:
	.vimrc