Running PR for hackathon

Push to this branch to update http://khmer.readthedocs.org/en/docs-hackathon/
"From your local copy of the khmer source code update your master..."