Fix everything

Glad that I almost torpedoed everything with a last minute change.
Merge branch 'master' of github.com:FREEDM-DGI/desd-controller

Conflicts:
	dgi-interface.cpp