emacs-packages.el: evil-escape, evil-surround