more work on pyinstaller changes for linux
Merge branch 'dev' of http://github.com/pupil-labs/pupil into dev