Updates to trunk neo4django