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