Additional Cake references to CakePHP and docblock typo
Revert Cake to CakePHP in ShellDispatcher::_initEnvironment()
Merge pull request #1715 from bcrowe/hotfix-docblocks

Additional Cake references to CakePHP and docblock typo.