cleanup

formatted code
moved Tuple3
moved Disjoint test case to a junit
change log4j to slf4j

there were still old references to log4j, so I changed them to use slf4j