Merge branch 'master' into kyle
Fix to problem w/ template selection.
Merge branch 'kyle'