Clean up
Code clean up
Merge branch 'master' into function

Conflicts:
	jkind/src/jkind/JLustre2Excel.java