rm decision jh GiveUp related code
refactoring justification_heuristic code
decision/: justification: refactor ITE out
decision/ : jh: refactor embedded ITE, other minor

other minor: cleanup some remaning fragments of GiveUpException(),
hopefully all is gone now.
decision: jh: more refactoring (.h->.cpp, xor/iff)
Merge pull request #6 from kbansal/decNewoptions

decision/ code refactoring
gitinfo modifications fix
Merge branch '1.0.x'
Fix for gitinfo (resolves bug 399).
Some exception specification fixes in SmtEngine/Command infrastructure
Single -q quiets messages/warnings.  Double -qq silences sat/unsat output too.
added option --model-u-dt-enum for outputting uninterpreted sorts as datatype enumerations + minor update to array rewriter to improve output for this option, minor refactoring of representative selection for quantifier instantiation, initial draft of disequality propagation option --uf-ss-deq-prop, other refactoring of uf strong solver, fixed bug 496, improvement for fmf enumeration of finite built-in sorts
fix for bv crash in incremental mode; this is a temporary fix for bug 493
Merge branch '1.0.x' of https://github.com/CVC4/CVC4 into 1.0.x
Merge branch '1.0.x'
Fix for quantifiers containing Boolean terms.
Bug fix for rep-set.

(Cherry-picked from commit c71ec27 in master.)
Merge branch '1.0.x'
Bugfix for SmtEngine: proper unsubscribing for NodeManager events
Merge branch '1.0.x'

Conflicts:
	src/smt/smt_engine.cpp