moved zinnia template overrides so they will take effect