Please review and merge

Updated sign up page and user models - see commit for more details