url-escape sitemap locations

Backported from fb414ea554776f4490c3d02b0777985220068d3c by Brendan
Wholihan.
Preparing release 0.7.9
Back to development: 0.7.10
add cgi.escape import
Wrong acronym detection documentation link

Conflicts:
	README.rst
Preparing release 0.7.10
Back to development: 0.7.11