fixed unit conversion
fixed unit conversion
Merge branch 'master' of https://github.com/stoughto/MKIDStd

Conflicts:
	MKIDStd.py