HMAC for better secrecy (related to bug 877923)
Ok -> OK (bug 879407)
Merge pull request #153 from muffinresearch/Ok-2-OK-879407

Ok -> OK (bug 879407)
for when you get a TypeError
change lockout logic to just redirect (bug 846074)
Send user uuid to solitude (bug 877923)
allow a user whitelist (bug 879360)
Merge branch 'send-uuid'

Conflicts:
	settings_test.py
	webpay/auth/tests/test_utils.py
	webpay/auth/utils.py
	webpay/settings/base.py
Resolve test_utils conflict post merge, bug 877923
clear the was_locked flag upon display (bug 877244)