Wesley escape

Rebased version of https://github.com/ContinuumIO/datashape/pull/84
Fixed in recent commit.