Added water switch
Merge branch 'master' of https://github.com/bradleypowers/olinoboat