Added Sum and Average filters
Fixed conf to account for WholeBuildingElectricity changing to power type
WholeBuildingPower has replaced WholeBuildingEnergy
Merge branch 'master' of https://github.com/VOLTTRON/openeis

Conflicts:
	openeis/applications/utest_applications/fixture_support.py