Changes to get Desmond dihedral energies to agree.

Note that there was an ambiguity dealing with signs of c1, c3 and f1, f3
The choice made here may result in some problems with conversion to GROMACS
dihedrals with this; check the handling of c1,c3 and f1,f3 if
dihedrals do not agree.