reorganise gitconfig
fresh-ify new gitconfig bits