Surround has been renamed to evil-surround.