Merge branch 'graceful-fail2' into bleeding-edge

Pull request merged into ged-lab/bleeding-edge
Merge branch 'bleeding-edge' of github.com:ged-lab/khmer into bleeding-edge

Updates since graceful-fail2 pull
Merge branch 'bleeding-edge' of github.com:cswelcher/khmer into bleeding-edge