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