Spike_Cataloger now finds peaks

Also vectorized the threshold function.
Attempting to make Github like me again
Still attempting to make Github like me
Last attempt to make Github like me
Merge branch 'master' of https://github.com/BrantCarlson/spark

Conflicts:
	conf.py