delete some unused/broken bundles
delete whitespace
add source tree option as a difftoool and merge tool