Python: remove the string replace hack

CSymPy now produces the same string representation as SymPy, so we just parse
it directly.
Update print for addition
Merge branch '2' into complex-fix