Updating the Cypher syntax highlighter.
Merge pull request #1154 from systay/optional-nodes

Move checking of labels on optional nodes to matching
Move token resolution to plan building

o Write tests
o Add Materialize.mapValues