Do not keep isNotOrLeaf, distributeDisjunction is improved but still flawed
Fix isCNF
Merge remote-tracking branch 'jose/jose'

Conflicts:
	logic.hs