Code clean up
Merge branch 'master' into function

Conflicts:
	jkind-common/src/jkind/lustre/visitors/ExprIterVisitor.java