highlight special state arguments
Merge remote-tracking branch 'upstream/pr/27'
Added include, extend, name, and names to keywords
Added highlighting for a few common misspellings