Replace the repo macro with modular pillar data and templates
Only create the files we have data for
Merge branch 'newmirrors'