Replaced 'v2_0' with 'v2_1' in cypher tests
Integrated cypher-compiler-2.1 into cypher module