Allow R and N value of normal scrypt to be specified

This allows the R and N value of the scrypt to be specified and removes some code duplication among scrypt and scrypt-n