Add template scripts for running climatology.py
Merge branches 'next' and 'master'
Merge branches 'master' and 'maint' into maint