Fixed more pupil detection errrors
Merge branch 'master' of https://github.com/UCSD-TIES/DVS-Python
Fixed conflicts