Now works with new vim submodules