Merged and increased plaintext limit to 87

I merged with the upstream, and increased the plaintext limit to 87.  This should be enough to cover *MOST* master passwords.