Iain's stuff tidied and anonymized
Merge branch 'papersubmit' of https://github.com/IainNZ/ORSoftwareTools2014 into papersubmit