Mash up rolling option, PBKDF2 support and support for rolling from Devise's default#26

tneems wants to merge 6 commits intoheartcombo:mainheartcombo/devise-encryptable:mainfrom

tneems:rolling-to-pbkdf2tneems/devise-encryptable:rolling-to-pbkdf2Copy head branch name to clipboard