Added energy functions to GC move; g1g2() energy function added to
Energybase; cmake cleanup