Improvements for energy/force and frequency matching
Merge branch 'master' of github.com:leeping/forcebalance