Provide default arguments to make_user
Make email a unique field on user

fixes #667 on github.
Merge pull request #690 from steventlamb/bug/667/unique_user_email

Make email a unique field on user