Revert "Merge branch 'ben-branch'"

This reverts commit a2d812baeccd08e12bceae04bd8952790c722e26, reversing
changes made to 4b75095957844e869416f71b4b751206f4ffc7c8.
test

test
twoafc gui and plots

**should only affect 2AFC stuff, let me know if it changes anything
else**
Merge branch 'master' into integrate-2AFC-task
leaving campus 10/21