Ensure URI's are escaped. Fixes #13
Merge pull request #17 from myagley/uri-escape

Ensure URI's are escaped. Fixes #13