fix directory watchers not picking up changes
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
removed test code