Merge branch 'master' of https://github.com/rtslab/EnergyBox
Repo cleanup
Some house cleaning. May not be a stable commit
The deletions
Merge branch 'master' into OS-X-support