undo the django 1.4 changes I made
Merge branch 'master' of https://github.com/lbedford/lbwreg.django

Conflicts:
	templates/registration/login.html
	templates/registration/navbar.html
merge diffs