Upgrade to CakePHP v 2.3.5 (Closes #23)