Refactor based on jekyll-watch clean-up.

https://github.com/jekyll/jekyll-watch/pull/5

Will require a new version of jekyll-watch.