vimrc updates, other submodule commits