Use new password hashing function
Change some variable names
Merge pull request #497 from timschofield/develop

Develop