fixes the blank form when resetting password
Made the password reset email friendlier.

Also did the same for the unlock instructions, while I was in there.
Fix broken test for unlock instructions

There were some extra assertions left over from Devise's use of mocks that no
longer make sense.
Merge pull request #149 from pozorvlak/password-reset

Password reset - make emails friendlier and fix blank page