Tweak gitconfig
Make hgrc include working
Merge non-private hguser content into hgrc