Merge pull request #53 from mrunalp/dev/cartridge_refactor

PHP setup/locked_files fixes.
WIP: remove-cart test in mock-plugin.feature
WIP: mock-plugin remove
Merge pull request #54 from pmorie/dev/cartridge_refactor

Add test for mock-plugin remove
Remove the evil redirect.