Rename GetWaveforms to WaveformSource
Code indenting tidied in ModulesReader
Code indenting tidied up for TemplateFactory
Tidy indentation of TemplateFactory.tpl
Handle arguments to a module differently so we options don't depend on the
factory