Added Haskell package pbkdf
Added Haskell AES package
Merge remote-tracking branch 'upstream/master'
Merge pull request #1940 from jacobhinkle/master

haskellPackages: Add AES and pbkdf haskell packages