Merge with upstream.
Permit modes to provide their own TokenMarker implementation while still using the keywords.txt file.
Merge pull request #2429 from jdf/master

Permit Modes to provide their own TokenMarker implementation.