Update neo4j to 2.1.5
Various code updates
neo4j to version 2.1.5