Fix for SmtEngine::expandDefinitions()---improper TypeCheckingException
more equality constant evaluation
Some model and printing fixes for defined functions in input.
Merge branch 'master' of github.com:CVC4/CVC4