Swapped out for a pure JS scrypt implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	util/util.js