Optimise imports. Upgrade Junit to 4.11. Some JavaDoc fixes.