3226: give diff a simplify option

See https://code.google.com/p/sympy/issues/detail?id=3226