small temp. fixes.
Merge branch 'v0.4_restruct' of https://github.com/pupil-labs/pupil into v0.4_restruct