Reverted whitespace tidying (except for section I touched)
Merge branch 'master' of https://github.com/rotu/sympy