Fixes syntax error
Adds thorough test for spike
Merge branch 'cbm_ext' of https://github.com/blazetopher/ion-functions into cython-extensions

Conflicts:
	ion_functions/qc/test/test_qc_functions.py