Move from Watchdog to Pyinotify (again). cf #15
Remove 'count' argument from 'generate' in tests