Merge in latest changes from root.
Comment out inline JS highlighting in html.vim.

It wasn't working, and it was just breaking highlighting in HTML at
large. We can revisit this later; how often do you write inline JS
anyway?