Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/MartyBurns/OpenESPI-GreenButtonCMDTest
Example file with one usage point, one customer, and three measurements

Signed-off-by: Marty Burns <marty@hypertek.us>