URL-encode URLs in URLs

I spotted this one in there while working on the other PR.

We'd forgotten to URL-encode the URLs that were being included in other URLs. ([Yo dawg...](http://imgur.com/qa9czdQ))