large Vim cleanup, hg rdiff