FIX: Update URL regular expression

There is a known CPU bug in the Regexp I previously used. In some circumstances you could use it to chew up lots of CPU with a particularly formed URL.

This fixes it and passes all tests.