Add vim-surround, remove command-t and tagbar