Changed order of arguments to produce a simpler API
Merge pull request #74 from peastman/master

Changed order of arguments to produce a simpler API
Added SWM4-NDP water model
Merge pull request #75 from peastman/master

Added SWM4-NDP water model
Updated to newer version of cl.hpp
Merge pull request #76 from peastman/master

Updated to newer version of cl.hpp
Include process ID in temporary file names to avoid collisions
Merge pull request #78 from peastman/master

Include process ID in temporary file names to avoid collisions
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
Merge pull request #79 from peastman/master

Added an argument to addHydrogens() for selecting which Platform to use for minimization. Also marked convertWater() as deprecated.
Lots of updates to documentation for new features in 5.2.
Merge pull request #80 from peastman/master

Lots of updates to documentation for new features in 5.2.
merge upsteam master