Reworked the 'file: salt_master' state to use contents_pillar; stripped a number of superfluous comments.