Merge branch 'next'

* next:
  fix, PEBKAC, always inc jp if *ip in intersection pruner vtxlst_intersection()
  hygiene, allow loop around waitpid() to return quickly
  minor, provide diff output (from the diff tool) when the output differs
  test, provide rotz-show regressions