Fix bug in atom highlighting. 

When an atom included `and` or `or` (or presumably any operator) it would break syntax highlighting.

Includes regression test.

Fixes #89