small updates
Merge branch 'master' of https://github.com/LightingResearchCenter/oddball_threeStimulus