Fixing htmlentities call to be more consistent
(especially between different PHP versions)
No longer using short tags... PHP 5.3/Travis hates it