Cleaned up resource labeling, corrected indentation in map.jinja, modified cert to use contents_pillar