catch up to changes in csvkit

the old pull request had merge conflicts. This resolves them. I think? this is easier than me making a new pull request to onyxfish/csvkit