Correct new keyword highlight bug
Use more precise string ending and beginning regex in keyword highlighter
Require keywords to have trailing whitespace or newline