remove deprecated functionality
add integration test
fix cs
Merge pull request #83 from cakephp/develop

Develop