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!
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