disable test cvc3_main, attempt to fix dist_check
Fix makefile dependence for system tests.
portfolio: fix export of emptyset
Fix two variants of Node::substitute().

Node::substitute() is overloaded.  One version was properly substituting
operators (e.g. the "f" in f(x) could be substituted).  The others were
ignoring anything in function position.  Fixed.  Thanks to Wei Wang for
pointing this out.
Merge branch '1.3.x'
reorganize substr, fix some potential bugs, adds cache for preprocessing
reorganize substr, fix some potential bugs, adds cache for preprocessing
Merge branch 'master' of github.com:tiliang/CVC4
No diamond-breaking under quantifiers (resolves bug #550).
Merge branch '1.3.x'