Merge pull request #25 from dart-lang/better-highlight