Use MELPA version of evil-surround