BF: Changed DS_Store to be correctly ignored
Merge branch 'master' of git://github.com/psychopy/psychopy
BF: fixed broken manual ('semi') calibration

Existing manual gamma calibration tools weren't working (older wx.XXX
code it appeared) so I re-wrote the luminance level dialog input code.
Merge pull request #385 from flipphillips/master

manual calibration fixes