Add joda-money, fix location