Merge branch 'master' of https://github.com/CVC4/CVC4

diff --cc contrib/run-script-smtcomp2016
index 0db378a80be768397a07c18de2c2edda11544b6c,056cddb8e561985b714bd346b33988fb237150d6..ad036ad0559f7c1e66548a1f309c75c831548887
--- 1/contrib/run-script-smtcomp2016
--- 2/contrib/run-script-smtcomp2016
+++ b/contrib/run-script-smtcomp2016
@@@ -33,15 -33,7 +33,15 @@@ QF_LIA
    # same as QF_LRA but add --pb-rewrites
    finishwith --enable-miplib-trick --miplib-trick-subs=4 --use-approx --lemmas-on-replay-failure --replay-early-close-depth=4 --replay-lemma-reject-cut=128 --replay-reject-cut=512 --unconstrained-simp --use-soi --pb-rewrites
    ;;
- ALIA|AUFLIA|AUFLIRA|AUFNIRA|UF|UFBV|UFIDL|UFLIA|UFLRA|UFNIA)
 +QF_NIA)
 +  trywith 20
 +  trywith 1800 --solve-int-as-bv=2 --bitblast=eager
 +  trywith 1800 --solve-int-as-bv=4 --bitblast=eager
 +  trywith 1800 --solve-int-as-bv=8 --bitblast=eager
 +  trywith 1800 --solve-int-as-bv=16 --bitblast=eager
 +  finishwith --solve-int-as-bv=32 --bitblast=eager
 +  ;;
+ ALIA|AUFLIA|AUFLIRA|AUFNIRA|UF|UFIDL|UFLIA|UFLRA|UFNIA)
    # the following is designed for a run time of 2400s (40 min).
    # initial runs 1min
    trywith 20 --simplification=none --full-saturate-quant