Fix parsing of URIs that have been URL encoded
Merge pull request #698 from smfreegard/fix_uri_parser

Fix parsing of URIs that have been URL encoded