Java 6, Junit 4.10, and various other minor updates