update vimfiles
merge with remote master
[...update submodules...]