F/upstream import

Merges all changes made to the upstream repo (CakePHP's) while preserving our customization. Mainly we picked up:

* some more very thorough doc block tests (makes most of the warnings/errors reported by `phpdoc` look redundant or insufficient),
* phpunit 4 and phpcs installed via composer
* and simplified travis test runs.