Merge pull request #441 from isolver/master

ENH: TextBox stim
ENH: User defined font files can be added...

to the FontManager TextBox uses
Merge branch 'master' of git://github.com/psychopy/psychopy