Merge branch 'master' of https://github.com/wrexroad/barrel-cdf-generator into spectrum_extract
Merged in changes from master branch. Started adding more basic energy conversion routines
Fixed conflict in documentation