Remove pid from master pidfile name

Fixes #20 -- superceeds #28