Hacked up some template changes in preparation for adding microformats.