update 2.1 tag for cakephp
update travis.yml
fix error in tests
Merge pull request #1 from ceeram/master

Sync with origin