* changed templates to take advantage of jinja2's super()