Adding a couple of extra metadata fields for filenaming.

[richardssam]

This helps define exactly how the output filename is defined, which then helps with the log files, and general template generation.