Inconsistent deep water assuption

[rebeccamccabe]

In some places I assume deep water and in others I allow for finite depth
Need to check equations and be clear about which are assuming what
Then ideally modify to be consistent, with a parameter controlling which (or automatically deciding based on kh)