More small changes
Merge branch 'tobdev' of github.com:jmxpearson/pupil into tobdev