fixed a bad combined csv file; fixed double application of htmlentities on some strings in convert.php
Merge pull request #2 from scottsb/data-converter

fixed a bad combined csv file; fixed double application of htmlentities ...