Some updates

Updated to HTMLPurifier 4.6 and did some renaming to follow the CakePHP 2.4.x naming conventions.