Correct template and add gitattributes
Merge pull request #35 from cakephp/master-template

Correct template and add gitattributes