0.7.3 merge

Fixed merge conflicts. Please check `sympy/__init__.py`, because I'm not sure if I did the right thing.