upgrade diff package to version 2.0 (documentation missing), fixed junit, fixed tk_tunnel test