Code clean up
Merge branch 'master' into function

Conflicts:
	jkind/src/jkind/analysis/TypeReconstructor.java