Refactor FileWatcher
Merge pull request #1228 from middleman/file_watcher_refactor

FileWatcher Refactor