Pep 8 and nitpicking

Also bumped neo4j version to 2.1.3.