test fixes
Template playing around
Updates to template schema and wizard
Merge pull request #196 from mballance-sf/master

Updates to template schema and wizard