SHA1 -> Phpass

Switch from SHA1 -> phpass, should be able to auto-merge now