Fixed neo4j-core.  Pushing here so that the tests pass
Merge branch 'master' of https://github.com/andreasronge/neo4j