Added pbkdf2 to generate key from pass
Merge branch 'master' of github.com:apexskier/wombat