fixed some names
Merge branch 'issue/normalize_args' of github.com:ged-lab/khmer into issue/normalize_args