merge resolve?
Merge remote-tracking branch 'johnnymo87/master' into auto_email_auth
full specs on promoting new user
ping pong on promote_new_user spec
auto email authorization feature completed