Merge pull request #2 from jvrunion/master

first push of a clone of energy
Merge pull request #3 from jvrunion/staging

Merge pull request #2 from jvrunion/master