Update language to refer to puppet agent and master

The `puppetmasterd` and `puppetd` names / commands are deprecated. Newer
releases of Puppet use `puppet agent` and `puppet master`, and very new
releases don't have those older commands at all.
Merge pull request #200 from zacharyalexstern/master

Update language to refer to puppet agent and master