Small touch-ups to simulation behavior and ph tests. Most of them pass now, even if they're still really slow at times. The breach ones don't pass, but also complain of dangling bone, so might work once the fix for that is in.
As described in gen/hood/merge/help.txt
Also fix bug in eth-watcher that didn't cancel outstanding threads when config changes. And set default rift for ourselves to 0.