fix vim submodules
more fixup submodules
merge master with fix submodules