uncommented border stuff because it was messing with AOI drawing if too close to border of frame
Merge branch 'master' of https://github.com/wmpauli/pupil

Conflicts:
	pupil_src/capture/eye.py