Fixing stuff up after rebase

src/main/scala/leon/purescala/ExprOps.scala

src/main/scala/leon/purescala/Expressions.scala

src/main/scala/leon/purescala/MethodLifting.scala

src/main/scala/leon/solvers/smtlib/SMTLIBTarget.scala

src/main/scala/leon/solvers/smtlib/SMTLIBZ3Target.scala

src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala

src/main/scala/leon/synthesis/rules/EquivalentInputs.scala

src/main/scala/leon/termination/Processor.scala

.../regression/verification/purescala/invalid/Unapply1.scala

.../regression/verification/purescala/invalid/Unapply2.scala

...ces/regression/verification/purescala/valid/Unapply.scala