rpearce: Puppetmaster should have it's own spec test
rpearce: Puppetmaster should add instead of overridding existing spec elements