Merge pull request #38 from pmorie/dev/cartridge_refactor

WIP: mock cuke test
WIP Cartridge Refactor

* Add support for v1_cartridge_format/v2_cartridge_format markers in /var/lib/openshift/.settings
Merge pull request #39 from jwhonce/dev/format_markers

WIP Cartridge Refactor
WIP Cartridge Refactor

* Removed unused code
Merge pull request #40 from jwhonce/dev/format_markers

WIP Cartridge Refactor
Merge pull request #41 from pmorie/dev/cartridge_refactor

Flesh out mock.feature
Add checks for default env vars to mock.feature