Expading on contain
Expading a bit more on matching
Fix typos and formatting
A few more small fixes.
Merge pull request #998 from cakephp/3.0-better-contain

Expading on contain