Made the Groovy CypherParser import optional in...

preparation for its removal in 1.8+.
Merge branch 'master' into scholrly