submodule updates and minor vimrc changes
resolving merges in submodules