Merge branch 'amoeba' of github.com:peastman/openmm
Merge branch 'master' of github.com:SimTk/openmm
Merge branch 'amoeba' of github.com:peastman/openmm
Added tip3p-fb and tip4p-fb parameter files.
Merge branch 'master' of github.com:SimTk/openmm
Merge branch 'master' of github.com:SimTk/openmm
Updated citation information
Typo fix
Renamed files, and updated user's guide
Merge pull request #458 from leeping/master

Added TIP3P-FB and TIP4P-FB water models