Lots of cleaning up of the code.
Merge branch 'master' of
https://github.com/taverna/taverna-engine-core.git