Resync with current master of official Psychtoolbox-3 repo.

Pull in David's new routines and OOP calibration stuff.