Resource csv

Some updates.  First this merges in current master.  Then some commits relevant to this topic.