BREAKING CHANGE: abstracted the Economy interface. 
resolve merge conflicts with upstream
update pom.xml for new CB version
Merge branch 'master' of git://github.com/MilkBowl/Vault into pr-sendmoney