restore long options for run.sh

My fingers are very used to typing "sh run.sh --keep" and "sh run.sh --noclean", and those options were removed for no reason along with the parallel-testing changes. This restores them, while keeping -k and -n.

I don't think it needs a changes note.