HMAC for better secrecy (related to bug 877923)
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)