committing because I have to
Merge branch 'master' of github.com:jmxpearson/pupil
Cleanplot oddball changes