Fixing csv reports.  Moving escaping into the template since otherwise w...

...e have double escaping problems.