Hi,

Cory noted that json is broken, jp told me about it, I looked at it and hated regexps.

This patch *seems* to work, and passes the tests.

The tests are insubstantial and my grasp of python's regular expressions is crap, so I'd like someone to review this patch before I commit it.

Stephen.