Modified files to use private state dir vs. pillar for certain data that is tedious to pillar-ize