Don't use /var/run - put pidfile in bin directory. /var/run requires root and we may not want that.
Modify stop to wait for stop, kill if required & remove pidfile.
Modify start to check for pidfile
Check for pidfile - if gone - do nothing.
Merge remote-tracking branch 'upstream/master'