The transactions now take money into account
Merge branch 'master' of https://github.com/phacks/marketplace