Add surround.vim, update a few submodules