Updated vimrc and submodules