Phpass instead of SHA1

Well I hope this can be auto-merged. I pulled everything from the main repo and merged.