fix 2.0 urls
Merge branch 'master' of https://github.com/michaelbrooks/wikicat

Conflicts:
	dbpedia/urls.py