Added total intensity counter
Peakfinder 3: Signal to noise now based on maximum intensity (as in IDL code)
Merge branch 'master' into testing