Deal with deletes in watch task
Run default task before watch

Otherwise it's easy to get an incomplete dist for the next test run. For
example, changing a test does not cause a build.