try to fix up user login code
Merge branch 'master' of https://github.com/lbedford/accounts

Conflicts:
	views.py
Merge branch 'master' of https://github.com/lbedford/accounts