Some better error screens
Replace welcome email with new template
Add in mailer previews
Merge branch 'features/better_intro_email' into develop

Conflicts:
	db/schema.rb