deprecated * Changing references in generators and encryptable_test
This makes the tokens better suited for URLs in plain-text emails, and is still secure for all practical purposes.