Use MacVim install for vimdiff.
gitconfig: remove 'st' alias, forcing harder to use 's'.
gitconfig: remove duplication in 'l' and 'll' aliases.