FF/TEST: text2_height.png

Other files exist for text2_units, but not this one. It appears on my machine after running tests, seems like its supposed to be tracked in git.
Merge pull request #492 from jeremygray/master

FF/TEST: text2_height.png
Merge pull request #491 from isolver/master

Color value fixes for some iohub demo's, updates to iohub.datastore.pandas
ENH: added support for 'Plugable' USB/serial adapter under OS X

According to info from Tushar Chauhan
Merge branch 'master' of git://github.com/psychopy/psychopy
BF: Removed comments
BF: exceptions -> stderr in iohub server
ENH: Tobii Calibration graphics

Now can have target expand / contract without linear movement between
target locations. (set motion speed to 0)
ENH: Add all fonts found in specified dir

addFontDirectory( self,font_dir, monospace_only=True, recursive=False)
Merge branch 'master' of https://github.com/isolver/psychopy