Update for latest version of OpenMM.
Merge branch 'master' into unified_model