Minor clean up
Upgrade Joda-Time 1.2, close #1041