cleanup for following gem versions of money-rails
test suite refactored
merged