salted scrypt key, included salt in miniLock ID, and allow user to recreate secret key if they have their passphrase and miniLock ID
updated tests
Merge remote-tracking branch 'upstream/master' into per_user_salt
Merge pull request #45 from diafygi/per_user_salt

Add salt to miniLock ID