Django 1.4 urls
Small fixes for 1.4
Merge branch 'master' into master1.4

Conflicts:
	djprogress/__init__.py
Merge Django 1.4 upgrade