changes to gemfile for local running, sign_up redirect has correct page
fix merge conflicts
changes to confirmation email body
many UX changes to login/sign_up redirects and messaging