BF: Fixed problem merging the start and end dfs for the ip
BF: LC Tech binocular recording

LC gazefollower ET model now works; supporting binocular recordings.
Merge pull request #4 from pedmiston/master

BF: Fixed problem merging the start and end dfs for the ip
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
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of https://github.com/isolver/psychopy
trying to fix merge issue
fixing merge
Revert "fixing merge"

This reverts commit a018ca1c6c66fe318ed45f79b2d464c3646e4fa5.
Revert "trying to fix merge issue"

This reverts commit 14df5ea49c6ee59c5f83c6956df25304197f0b1f.
removing mangled file
adding good version of file back
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge pull request #498 from isolver/master

Misc. ioHub Update + one method added to FontManager