Updated {== Highlights ==}, Snipmate, and Surround.vim additions

Commits explain it all.

Next up is accepting/rejecting changes. That will be tricky, maybe.