Restore ability to watch multiple arbitrary directories

Previously the --watch CLI flag appeared to have no effect. Certainly not
the effect as documented in the README.