Update additional Cake references to CakePHP
Fix more Cake references to CakePHP
Merge pull request #836 from bcrowe/hotfix-cake

Update additional Cake references to CakePHP