Merge pull request #82 from pmorie/dev/cartridge_refactor

Use v2 carts with rhc
WIP Cartridge Refactor - Fix unit tests

* mocking did support contract
Merge pull request #83 from jwhonce/dev/wip_v2

WIP Cartridge Refactor - Fix unit tests
WIP: v2 mock lifecycle test