Fix conjuctive visitor
Merge branch 'master' into function

Conflicts:
	jkind-common/src/jkind/lustre/visitors/ExprConjunctiveVisitor.java
Code clean up
Merge branch 'master' into function

Conflicts:
	jkind/src/jkind/sexp/Cons.java
	jkind/src/jkind/translation/RemoveCondacts.java