cleanup of html.vim

Issue #6
I cleaned up the html.vim script some more, mostly using clusters.