Remove pid from master pidfile name. Closes #20.

There's no use of a .pid file storing the PID if you need to know
the PID in order to read the file...