Fixed issue with neo4j 2.1.2 incompatibility

Model reads were throwing `Cannot match on a pattern containing only already bound identifiers` exceptions. This is related to a change as of Neo4j 2.1.2. This pull request updates the query assembler to use `WHERE` instead of `MATCH` where appropriate. Also bumped the test suite to test against 2.1.2.

Apologies for the git churn, just cleaning up some extra whitespace.