Merge branch 'master' of github.com:SimTk/openmm into docs
Merge branch 'docs' of github.com:rmcgibbo/openmm into docs