Squished some bugs in the csv_maker.rb.
Also modified the sql files slightly to handle copies from generated files.