modularized energy calcs
Merge branch 'master' of git://github.com/joshm1229/MCGPU