Add evil surround

Clean up lisp