submodule updates and resolved .vimrc merge