Water attempt 2

These should be the same changes as simtk/msmbuilder#360 redone so that it will be able to be merged.