Fixed plaid water overriding bug

Just had to override canDisplace and displaceIfPossible to fix that.  I
also clenaed up some extraneous comments.