Fix incorrect column mapping on CSV upload.

Handle formatted value column (which had been missing for some time).
Fixes #525.
Update test CSV to reflect current results
Merge pull request #527 from flibbertigibbet/feature/fix-csv-uploads

Fix incorrect column mapping on CSV upload.