I'm looking at purchasing a couple of filters to go with the 15-85mm lens on my 7D. I will generally only be using them for waterfalls, etc. Would a ND4 and a CPL be sufficient?

Just after a couple of suggestions on which ones to buy. Any links would be appreciated