Change the default encryption rounds
5000 rounds!
Make sure pbkdf2 uses str type instead of unicode type
Merge branch 'werk' into dre