TwoElectronInteracting now inherits from TwoElectronNonInteracting, instead of directly from TrialWavefunction. The wavefunction in the interacting case is now evaluated in the parent class (the normal harmonic oscillator wavefunction) AND in the interacting class (the Jastrow factor).