Merge branch 'better-sympy-if-statement' into 'master'

Implement pymbolics If statement through sympys Piecewise

See merge request !10