New upstream release + watchfile fix

(I also PRed for the upstream branch to preserve history).

Since I'm packaging one of the primary rdeps for python-py, pytest, I offer to comaintain codespeak-libs.

Note that the new pytest upstream version depends on python-py >= 1.4.13 :-)

Cheers,
Simon