Rename scrypt to django-scrypt, as we have more generic scrypt inbound.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Rename scrypt to django-scrypt, as we have more generic scrypt inbound.

Conflicts:
	src/django_scrypt_fmt_plug.c