Fix more doc block errors in lib/
Tidy up and simplify travis.yml file.
Merge pull request #3829 from cakephp/api-doc-fixes

API doc fixes