Marged with master.
More verbose output of Coulomb energy with sampling output.
Conflicts:
	src/core/d2o_main_class.h