RFE: Combine supervise and supervise_recover

[dheiman]

It should be straightforward to have the supervisor command simply detect if the given recovery file exists, and run using it, rather than have a separate command.

We should ensure that supervisor.py deletes the recovery file after a successful completion so that we don't accidentally go against the user's intentions.