okay
bad commit
Made solar electric and hotwater changes
okkkk
Merge pull request #143 from extremezoo/Everett's-branch(6/5/14)

Everett's branch(6/5/14)