Wesley escape

Rebased version of https://github.com/ContinuumIO/datashape/pull/84
I didn't catch this before - repeating 4 lines of code to include/exclude the comma, could append the comma after.