Let's map the int's from inotify_add_watch to folder names

This allows us to resolve it back later on.
Merge remote-tracking branch 'github/master'