smaller changes to the peak extraction and plotting routine
Merge branch 'master' of https://github.com/mbraeunlein/CurrentVoltage

Conflicts:
	plot.py