.gitconfig updated; some cleanup