Update for Scala 2.10.1, junit 4.11

Mockito as well, but that didn't seem to cause any issues.