Several small enhancements to users+meta, theme, emailer
Merge branch 'broke'
Forgot password handling.