Changed the master template to be configurable entirely from the pillar