Add test for watching files
Merge pull request #519 from kevva/test-watch

Add test for watching files