Switch to Neo4j 2.1