Speed up adding file watchers. Fixes #1

A work in progress to fix the server blocking file watcher setup