Updated to JDK 1.7 and JodaTime 2.3