Fixed Water and WaterView

Also restored SN2Model to using OH and made SN1Model use water