Fixed sitemap and url routing.
Merge branch 'master' of github.com:elin-moco/bedrock

Conflicts:
	bedrock/urls.py