Remove URL module and update spec that depended on it.
Merge pull request #1414 from asolove/remove-url

Remove URL module and update spec that depended on it.