Add variable to include additional templates to merge

This patch adds a variable to allow for additional template paths
to be passed to the merge.py call.