PSR-2 tidy
Alphabetise Twig_SimpleFunction array
Alphabetise Twig_SimpleFilter array
Merge pull request #2182 from GawainLynch/hotfix/cdo-tidy

CDO tidy up...