hopefully cave ready
Merge branch 'master' of https://github.com/taparson/psychophysics