Resolves merge conflict
Sets up a basic mailer for password resets
Finishes resetting passwords
Merge branch 'forgot_password'