Merge branch 'merge-pull-124' into lammps-icms
From Iain Bethune at EPCC in Edinborough:
Some small optimisations to the pair_lj_charmm_coul compute() functions,
principally storing reciprocal values to avoid excessive floating point
divisions. In my tests (for a system dominated by these pair
interactions), it gave a 4% speedup.