Make Cypher stuff less sucky by parameterising the queries
Merge latest portal work into Cypher improvements
Merging tip (again).