Refactored passwordSalt back into SQRLIdentity

By refactoring passwordSalt back into SQRLIdentity, then the SQRLPasswordParameters can just encompass the scrypt params. This allows them to be passed in during password changes and exporting the master key. It also allows us to return SQRLPasswordParameters objects as suggestions from the ScryptMetrics.