I changed two_threshold_spike_find so that a 1D array with one integer
value is changed to an integer.  This is to avoid errors starting with
numpy 1.9.  I'm not sure what the changes in other files were.