Less automatical evaluation for Equality, improve simplification

fixes #6116

see also #7960
https://github.com/sympy/sympy/pull/7960#discussion_r19208447