Add vim-surround and matchit.