Update to latest Tortoise and Headless

Gives Tortoise watch support!