Some changes, mostly to gitconfig