Merge branch 'mwright/opt_nbm' of github.com:ged-lab/khmer into fix/fastq-to-fasta_N