Use neobundle recipes
Add plugin, conflict-marker.vim
Add textobj plugins
Add operator plugins
Delete vim-surround
Add vim-textobj-anyblock