Jonas Berg

I think it's better to follow the "official" naming [used by Percival](https://www.tarsnap.com/scrypt/scrypt.pdf) to avoid the confusion seen in e.g. [this SO thread](https://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors). Calling r just a 'memory cost parameter' seems...