cleanup of capture classes
Merge branch 'dev' of https://code.google.com/p/pupil into dev