Removed now redundant fetch_template_uri function
Merge branch 'cfn_support' into add_tag_support