Bring vim in (no longer a submodule)