fix standard scrypt support

undo the changes that butchered the scrypt support for scrypt-chacha.
Now they can co-exist.
--scrypt activates scrypt 1024,1,1
--scrypt-chacha activates scrypt-chacha N,1,1