Issue #268 - Move to CakePHP as a submodule