fix broken test (watch on unreadable dir), tweak code, fix race in test
Merge pull request #4 from aybabtme/fix-tests-and-tweaks

fix broken test (watch on unreadable dir), tweak code, fix race in test