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.
FIX: Allow un-overloading Pyglet
FIX: Revert silly change
Merge pull request #385 from flipphillips/master

manual calibration fixes
FIX: Bring in Pyglet changes
STY: Add comment
Merge pull request #386 from Eric89GXL/overload-overload

FIX: Allow un-overloading Pyglet lib dir
ENH: RatingScale can accept arbitrary response keys (new param)
TESTS: test ratingscale.py

- 86% coverage testing the init code, some .draw() coverage
- no added visual testing
TEST: RF test_ratingscale, ~95% coverage
Merge pull request #388 from jeremygray/master

ENH: RatingScale can accept arbitrary response keys (new param)
TEST improved testing of ratingscale.py

- 97% coverage, more asserts, use TEST_FONT
- minor tweaks to the ratingscale code to avoid bad values
Merge pull request #389 from jeremygray/master

TEST improved testing of ratingscale.py
TEST visual.helpers: contains(), .overlaps()

- 100% coverage of contains() overlaps() if you test using matplotlib 1.2+
Merge pull request #390 from jeremygray/master

TEST visual.helpers: contains(), .overlaps()
DOC: Fixed paths to images for case sensitive platforms.
DOC: Fixed warnings from sphinx and corrected two links.
DOC: Included missing file in documentation and corrected syntax.