Run the dispatching in simplify() first
Always sympify in simplify()
Merge branch 'master' into simplify-dispatch

Conflicts:
	sympy/simplify/simplify.py
Merge branch 'simplify-dispatch' of github.com:asmeurer/sympy into simplify-dispatch
Merge pull request #7701 from asmeurer/simplify-dispatch

Run the dispatching in simplify() first