Remove unnecessary messages.
Allow sending of a different email template for the email that is automatically sent when the user signs up.
Merge branch 'add_welcome_email' into better_custom_master