Updated friction measurement.

I like the idea of using a fixed number of WaitForSlip() calls, instead
of a fixed time limit, because the subject gets the feedback about the
grip force.