moving template substitutions to TemplatePlan and ProjectPlan.  Closes GH-6