Merge branch 'master' of git://github.com/sympy/sympy into direct-imports
Made module import test a normal unit test.
Merge branch 'direct-imports' into eliminate-duplicate-imports