Make cursor echo handle include files.
Bug fix: add enabled/disabled guards to notifiers.

Also handle the case when user disables notifiers after the first run.
This doesn't work for signs though, since it causes an ugly flicker in
the common case.
Merge remote-tracking branch 'upstream/master'