oh god redirect loop

Conflicts:
	sjfnw/urls.py
registration bugfix

reported by karen
fixes