Merge branch 'master' of git://github.com/psychopy/psychopy

Merge: should fix testing?
git push origin masterMerge branch 'master' of git://github.com/psychopy/psychopy
Psychopy OSX 64-bit compatibility added

Got psychopy to work on 64-bit OSX systems, with pyglet 1.2 alpha 1
Corrected system check for pyglet.lib overload
Another corrected platform check

This one slipped my attention for a minute
Platform checks done right this time
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of git://github.com/psychopy/psychopy
DEMO: practical IAT

- scoring script included (good) but requires command line (bad).
TEST: add a non-travis test for key-RT

- currently fails on mac when run on local machine; test is skipped on travis with py.test test_misc/test_event.py
TEST: more permissive time range was needed
TEST: skip test isPressedIn -- can't set mouse pos yet
BF: builder movie component: correct indentation
Merge pull request #588 from m-macaskill/master

Beginning to allow conditions via file or list
BF: Small comment changes
DOC: updated overview of visual module
BF: monitor gamma didn't return to original value when script crashes and call Window.__del__
RF: attributeSetter Aperture.enabled for Aperture.enable/disable.
RF: attributeSetters for Aperture properties "ori", "pos" and "size".
RF: attributeSetter for BufferImageStim "flipVert" and "flipHoriz".