removing unnecessary parts from comparator
ignoring MAC OS X system files
Merging latest master changes to git-bisect branch.