Remove some debugging code from the equilibrium calculation
Reorganizing some of Equilibrium into static methods. Add back a method to sample the energy surface in the energy_surf module. This should fix #1 for the time being, but eventually things will need to be organized into a longer-term solution.