Add another Jruby hack script (serves as munging example...)
Merge branch 'master' of github.com:mikesname/neo4j-ehri-plugin
Merge branch 'master' of github.com:mikesname/neo4j-ehri-plugin
Revert commit that wasn't ready for master
Merge branch 'master' of github.com:mikesname/neo4j-ehri-plugin
Tooling around with TX, trying to find leaks
Upgrade Neo4j version
Merge branch 'master' into serialized_versions

Conflicts:
	ehri-frames/src/main/java/eu/ehri/project/views/impl/LoggingCrudViews.java