Fixed up DPH function
Merge branch 'master' of https://github.com/mikemoorester/ppp

Conflicts:
	esm/consolidateResiduals.py