standardized some Desmond energy terms
Merge branch 'master' of https://github.com/shirtsgroup/InterMol