Updated submodules and small changes to vimrc