Merge pull request #1 from cakephp/master

Updating my master branch.
Merge branch 'master' of https://github.com/cdburgess/cakephp