Update submodules and minor chg in vimrc