Merge pull request #391 from way2muchnoise/1.7-update

removes water as minechemFluid