removed commented-out code
Merge branch 'develop' of github.com:secure-software-engineering/soot-infoflow into develop
some more logging, some more assertions, some code simplifications, and a horrible hack to get us out of the worst if the executor runs into strange behavior (as it does on Jenkins, but nowhere else...)