Merge pull request #36 from pmorie/dev/cartridge_refactor

Dev/cartridge refactor
WIP: mock cuke test

Get marker steps working
Add steps for dynamically rendered env entries
Fix unlock gear