Erin--please merge again :)

made some changes to my experiment and fixed some stuff with interspersing catch trials, which should be useful to everyone!