psychopy/psychopy — pull request #354 by isolver (2013-07-31 14:00:46+00:00)
Title: BF and ENH. See commit info for details

Please ignore the July 23rd commit and revert items listed; mistake on my part. ;(