Bunny merge back to master

This moves the bunny branch back into master and takes a dependency on buttercoin/buttercoin-engine while removing support for currency-market.