minor turn-prober improvements

this moves the cleanup to a trap function. Also kills Xvfb the hard way, I ended up having lots of dead Xvfb processes when testing.
shouldn't this be grepping for "$1" ?