Add better handling for removing watched files

A common log rotation scenario involves moving a watched file to a different path and then creating a new file of the same name. This fix addresses that scenario.