Updated submodules and vimrc