trim leading and trailing whitespace on csv import
Merge pull request #927 from stuartf/csvtrim

CSV import fields need trimming