Changed submodule for ViM for test setup/teardown from 3 to 2.