Cypher documentation fixes
Re-enabled the 2.0 parser in the Cypher tests
Cypher:  Changes OR syntax for relationships

 The parser now accepts "|" followed by ":"

  Example: MATCH (a)-[:FOO|:BAR]->(b)
Merge pull request #575 from systay/fixes

Misc fixes and cleaning