Harden free energy calculation for unsampled states.
Cleaned up fix for unsampled states
Minor update to self-consistent
Merge pull request #125 from kyleabeauchamp/fixunsampled

Harden free energy calculation for unsampled states.