Minor simplifications/tidying up.
Macro for merging source trees for building different versions of the same app.
Do Cobertura instrumentation under the build directory rather than creating another top-level directory for it. Also, don't delete instrumented JARs at the end of the tests, they may be reusable in a subsequent test run.