Round 2 at trying to get intl installed in travis
Fixing fatal errors in PHP 5.4
Fix path related failures in bake tasks.
Another fix for php 5.4
Merge pull request #3363 from cakephp/windows-test-fixes

Fix path related failures in bake tasks.
Fix file array parsing for flat file arrays.

The file array parsing was not correct when handling flat file arrays.
When dealing with flat arrays we don't need to munge data nearly as
much.

Fixes #3364
Fix warning when _ids is an empty value.
Merge pull request #3372 from cakephp/issue-3364

Fix file array parsing for flat file arrays.
Merge pull request #3371 from cakephp/sqlserver-pagination

3.0 - Fix pagination in Sqlserver2008
Using a locale with less variaion so travis is happy
Using a custom assert instead of a custom locale
Making time tests a bit more resilient
Even more flexible tests to account for travis
Fixing CS errors
Allow setting only default layout without specifying template in email config.

Closes #3336
Merge pull request #3373 from ADmad/2.5-cakeemail

Allow setting only default layout without specifying template in email c...
Improve return values of Paginator::params()

Always returning an array fixes downstream fatal errors caused by
merging an array onto null.

Fixes #3374
Making some code look a bit prettier
Merge pull request #3375 from cakephp/issue-3374

Improve return values of Paginator::params()
update composer.json