WIP: Eliminate indirect import errors.
Merge branch 'direct-imports' of github.com:toolforger/sympy into direct-imports