Fix reversed logic with NoFileManagerWatch. Also, take match into
account for -x. Fix mostly contributed by Kevin Burge.