Another attempt at dealing with the fact that some compilers define round() and others don't
Merge branch 'master' of https://github.com/peastman/openmm