Merge branch 'master' into pretty_print
Merge pull request #2 from stepthom/pretty_print

Prettier printing of MathFunctions
Merge branch 'master' into sort_terms