Whittle down where this is actually happening
Pass encoding where possible
Merge pull request #640 from cpcloud/fix-csv-encoding

Fix OS X Encoding test