Revert "deal with adding water to mixtures separately"

This reverts commit 36ed8d68e4771181bd1d6eec823710c07597df4c.
Identify water from cas_strings, add tip3p forcefield