Refactor checkAndLoadSingleServlet to also accept Files instead of just filenames
Refactor DirectoryWatcher to use a general event handler
Merge branch 'dirwatcher'