reset password edits
add password reset
Merge branch 'master' into venkman
format password reset view & link to login page
Merge pull request #33 from blind-squirrel/venkman

Venkman
Merge branch 'master' into Sharon
preparing for a pull