Refactoring for more readability.  Added templates_list and template_upsert rake tasks