Added an argument to addHydrogens() for selecting which Platform to use for minimization.  Also marked convertWater() as deprecated.
Merge branch 'master' of https://github.com/peastman/openmm