Running PR for hackathon

Push to this branch to update http://khmer.readthedocs.org/en/docs-hackathon/
'Need to force another continuous integration run? Put "test this please" in a comment.'