Merge pull request #113 from mistaguy/master

Use constant DS instead of "/" to avoid issues on windows.
Merge pull request #1 from cakephp/master

Merge pull request #113 from mistaguy/master