Revamped peakfinders so that they can be called in a more general way; updated the peaks.txt file to something easier to parse.