Merge pull request #11 from dz1111/master

Updating changes related to export.
Bug fixes IIRC.
Merge branch 'master' of https://github.com/Hawaii-Smart-Energy-Project/Maui-Smart-Grid
Merge pull request #12 from daveywilkie/master

Better use of dicts
Merge pull request #13 from dz1111/DataAggregation

Data Aggregation Phase 1
added pv system col
adding solar+ col
Merge branch 'master' of github.com:Hawaii-Smart-Energy-Project/Maui-Smart-Grid into DataAggregation
Merge pull request #14 from dz1111/DataAggregation

Data aggregation
Merge branch 'master' of github.com:Hawaii-Smart-Energy-Project/Maui-Smart-Grid into DataAggregation