typo fix
typo fix2
Merge branch 'dev' of https://code.google.com/p/pupil into dev
update for gitignore, removing a local one.
added more metainfo to recorder
bug fix for calibration display.