fixed problem where smarty was creating invalid cached file names for email header/footer

merging in some other changes