Merge pull request #32 from blind-squirrel/venkman

Venkman
reset password edits
add password reset
Merge branch 'master' into venkman
format password reset view & link to login page