Merged recent changes from release brances

Merged recent changes made to the release branches 0.12-neo4j-2.0 and 0.13-neo4j-2.1 into master and updated README.