Changed Spike_Cataloger and toolbox

Commented out the section that made a plot at the end of Spike_Cataloger
and changed Kevin's time_intervals so that it won't give him an error
Merging conflicts
Merging conflicts
Merging conflicts
Last attempt to merge conflicts
I lied, I'm trying again
Last attempt to merge conflicts using this method
Merge branch 'master' of https://github.com/BrantCarlson/spark