Only set token back if password reset fails.

This prevents the digested version of the token being saved when a reset
is successful.
Improve README.md flow

Improve the way in which the README.md file flows when read.
Merge pull request #3353 from psgs/readme-update

Improve README.md flow
Merge pull request #3318 from BrentWheeldon/bugfix/clear-reset-token

Only set token back if password reset fails.