Bugfix for UCond-DCond2 fusion. Added condition aggregation on if-then-else.
Temporarily disabling general simplification to run after fusion (this causes a bug)
Merge branch 'master' of github.com:DaMSL/K3-Core