Allow associations inline with contain specify their own finder methods
Updating how I'm doing this
Merge branch '3.0-contain-with-finder' of https://github.com/patrickconroy/cakephp into 3.0-contain-with-finder

Conflicts:
	tests/TestCase/ORM/EagerLoaderTest.php
Update to where finder options get parsed as array

This will make it so anywhere a finder is specified it can be an array. Table::callFinder infers the finder and its options from $type, if it's an array.