Added support for CSV output

I can't figure out how to comment on a line not in the diff.  On line 127, it looks like its missing the .format(...) call.