Grammar
Only highlight a whole word and not some selection.

Borrowed some code form the Find-and-replace package.
https://github.com/atom/find-and-replace/blob/master/lib/select-next.cof
fee
More coffee tidy up