Added sensor fields for GreenButton input.  Modified general_definition
to associate correct unit_type for power and energy.