Move to latest Hamcrest and JUnit
Tidy CleanDirectoryRule