Minor source reformatting
Merge branch 'effects2' of github.com:DaMSL/K3-Core into effects2
Added DoAndIfThenElse for fixing indentation