[vim] Add new vim bundles.

This also tries to fix up a couple others to point to better locations.