Alias updates, including removing quite a few old ones.
Remove git diff settings that didn't work and didn't affect anything.