Upgrade to CakePHP 2.4