Merge branch 'master' of github.com:scholrly/neo4django
Merge branch 'master' of https://github.com/nikolasd/neo4django