fix `watch-test` build step.
apparently requiring code under test from your build script breaks
the watch: the tests re-run, but on old code.
Merge branch 'master' into word-wrap