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
Merge branch 'master' of git://github.com/psychopy/psychopy