vimrc: rearrange
git: use patience for diffing