Document the reshuffler. Add more tests.
Merge pull request #10 from marcvinyals/bugfix

Bug fix: cnfgen should read arguments other than the command line.
Merge pull request #8 from marcvinyals/test-reshuffle

Document the reshuffler. Add more tests.
Merge pull request #7 from marcvinyals/reduce-memory

cnf.dimacs() outputs to a file
Merge branch 'master' into noise
Merge branch 'master' into reshuffle2

Conflicts:
	test.py
Merge branch 'reshuffle2' into master2
Merge branch 'noise' into master2