Fixing login again...
Merge branch 'master' of github.com:diamondman/Moose

Conflicts:
	moose/views.py
Merge branch 'master' of github.com:diamondman/Moose