Merge github.com:rsltrifork/DeltaPVOutput

Conflicts:
	DeltaPVOutput.py
	MultipleDeltaPVOutput.py
	debug.py
	power-now.py
fix
Merge github.com:rsltrifork/DeltaPVOutput