Tidy template slightly
Rename pageblock_template to output_template

It's templating everything now, not just the pageblock data.