Code clean up
Merge branch 'master' into function

Conflicts:
	jkind-common/src/jkind/lustre/TupleExpr.java
	jkind/src/jkind/analysis/TypeReconstructor.java
	jkind/src/jkind/translation/InlineNodeCalls.java