cleanup, prepare for merge with vim repo