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