Reworded all of the pair functions to eliminate gromacs numeric combination rules.