oh, sorry been on vacation. I should be able to fix up the conflicts in the junit PR

Just fixed the conflicts in the junit pr: https://github.com/cloverage/cloverage/pull/127