Add water as environmental sample type

Fixes #677
Merge pull request #679 from adamrp/issue_677

Add water as environmental sample type