Pass match_water parameter to specialised solvation functions

[lohedges]

This PR fixes a bug where the match_water parameter wasn't passed from the generic BioSimSpace.Solvent.solvate function through to the specialised functions for the supported water models. I've generalised the test so it uses both function types so that we catch similarly missed parameters in future, e.g. when anything else is added.

Closes #185.

• I confirm that I have merged the latest version of devel into this branch before issuing this pull request (e.g. by running git pull origin devel): [y]
• I confirm that I have permission to release this code under the GPL3 license: [y]

Suggested reviewers:

@chryswoods

[chryswoods]

Looks good - Am I right in remembering that the root cause of the bug was the change in the number of positional arguments, so match_water wasn't passed correctly? Is it worth switching to keyword arguments for these many-argument functions?

(no need to do this for this PR fix - but something to consider for the future)

[ignore - posted this because I misread a GH notification - I thought this PR was familiar!]

[lohedges]

Yes, that's right. They should really be keywords. They are everywhere other than the validation function, so I'll update that in future. There used to only be a few, but it makes sense to switch to keywords now they have proliferated.

No worries. I forgot to remove the review request since it was identical to the previous PR.