Merge branch 'bleeding-edge' of https://github.com/ged-lab/khmer into
cosmetic-merge

Conflicts:
	sandbox/split-pe.py
	sandbox/strip-and-split-for-assembly.py
	scripts/interleave-reads.py