Lots of changes, mostly to vim. -POLM