Update old markup

Missed two template pages in the original markup update. Fixed 404 and
archive and removed test code from content.php