Avoid unsettling zero-division warnings.
Merge branch 'master' of git@github.com:diffpy/diffpy.srxplanar.git
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	diffpy/srxplanar/calculate.py
Merge branch 'develop'
bug fix: self calibration