More switches and fix for partition count.
Make CSVLoader same as master and CSVLOaderMT with switches to compare the two.