Update various shortcuts. Update vim submodule