vim syntax highlighting improvements