Resolves merge conflict
Sets up a basic mailer for password resets
Fixes the broken search page. Fixes some screwed up HTML.
Finishes resetting passwords
Merge branch 'forgot_password'
merge conflicts