Tidying up arti config watch (and sighup) code, esp FileWatcher

The code is a bit tangled, mostly because of the API to FileWatcher, !702 (comment 2832257)

As per discussion there, we want to do this after !679 (merged) which is in turn blocked on upstream notify releasing their 5.x