#183: merged in Vicki's change to the main repo and also made static pages rendered as templates