First pass for login/signup merge, see #8
Merge branch 'master' into feature_8
Combine login/signup process, see #8