Stopping non-linear terms from entering the dio solver. Fixes bug 547.
Merge branch '1.3.x'
Merge branch 'master' of github.com:CVC4/CVC4