Back compat for cycle point templating.
Tidied new command help.
Merge pull request #1156 from hjoliver/back-compat-templating

Back compat for cycle point templating.