Repo cleanup ala OSX
Merge branch 'master' into OS-X-support
OS X working
Untracked files in the repo
Merge branch 'OS-X-support' of https://github.com/rtslab/EnergyBox into OS-X-support
ProcessTraceOSX beta working. More testing is needed
OS-X-support and master merged into the OS-X-support branch