update html-ish ftplugins
Merge branch 'local_changes'