Added cleanup-buffer from emacs rocks and advice for sgml-delete-tag
Refactored surround-with functions