Remove stray debug print_r
Merge remote-tracking branch 'origin/new_templates'