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
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).
BF: Fixed alignment of GUI dialogue box

Style was not accepting both right alignment and vertical centring. Lazy fix by just getting rid of vertical centring, as neither were working anyway!
BF: fix bug introduced to getKeys/waitKeys

CHange made in
https://github.com/psychopy/psychopy/commit/788292b736aa8d357ca5487d69ee02b3995ba79f
was causing issues for these functions when a clock instance was padded
in as the timer arg.

Also changed _onPygletText to use psychopy.clock.getTime()  instead of
psychopy.core.getTime() as it was before.

This fixes this specific (and big) bug I introduced, but does not
address other issues (which I thought the original commit was fixing).
Will look into this more later.
Merge pull request #585 from isolver/master

BF: fix bug introduced to getKeys/waitKeys
Merge pull request #584 from thomascope/master

BF: Fixed alignment of GUI dialogue box
Beginning to allow conditions via file or list

Allow Builder users to specify the conditions for a loop as either a
file (as previously) or as a variable containing a list of conditions.
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".
BF: uninformative handling of error if BufferImageStim had non-list "stim" argument.
RF: attributeSetter for Circle.radius.
ENH: MovieStim2 and demo

MovieStim2 should now work in terms of all public methods and input args
I think.

Looping is also working now.

Demo shows how to use start, stop, pause, seek, and volume up and down.

Jeremy, I tried 3 videos when running demo script within PsychoPy Coder,
and all seemed to work fine. Please let me know if u see issues.

Not 100% happy with audio / video syncing all the time (it is not always
within 1 frame synced), but seems usable from the 10 videos have have
tried. Time could be spent improving it more I think, but I am out of
time for this. ;)

One video I have is corrupt because of no key frames (as informed by
text put to stderr from openCV). It plays, but pausing or seeking makes
it all messed up. Playing the video using VLC also shows issue; video
play position can not be changed with slider gui; and instead the movie
restarts each time slider is moved by user. So I think this is a genuine
video file issue.