minor bug that caused displayed energies to be in different units during statistics printing
Merge branch 'master' of https://github.com/shirtsgroup/InterMol