Merge pull request #579 from isolver/master

BF: TextBox crash on OS X
Merge pull request #580 from isolver/master

Clean up of movie2.py and movie2stim.py demo