Unified evaluators
Merge branch 'master' into functions

Conflicts:
	jkind/src/jkind/analysis/evaluation/ConstantEvaluator.java
	jkind/src/jkind/analysis/evaluation/InitialStepEvaluator.java