upgrade joda-time
Merge branch 'jodatimeupgrade' into travis