Normalize (consolidate) tokens of the same kind#23

iafan wants to merge 1 commit intosourcegraph:mastersourcegraph/syntaxhighlight:masterfrom

iafan:consolidate-tokensiafan/syntaxhighlight:consolidate-tokensCopy head branch name to clipboard