Merge khmer 1.0 & PyCon-related changes into master.

Merge all of the khmer 1.0, PyCon benchmarking, and PyCon Software Carpentry NGS workshop changes into master.