vim: better Go coloring.
Merge branch 'master' into linux