cnf.dimacs() outputs to a file
Merge branch 'master2' into reduce-memory