Add surround and remove codeintel
Update plugins. Disable slow plugins