Bunny to Master Merge

Fixed HEAD issues and compiled.

Unit tests will fail as now depends on buttercoin-engine. So needs updating to call these.