redo gitconfig to be safer, do actual merges

Conflicts:

	home/.gitconfig
properly check for clipboard support, try again at ShowTabsWhenExpandTab