Fix find spikes#2

corinneteeter wants to merge 2 commits intoaiephys:masteraiephys/neuroanalysis-test-data:masterfrom

corinneteeter:fix_find_spikescorinneteeter/neuroanalysis-test-data:fix_find_spikesCopy head branch name to clipboard