Delete pidfile on stop
Merge branch 'delete-pidfile-on-stop'