Initial changes for batch welcome email
Further fixes for bulk emailer.
Merge branch 'master' into batch_welcome_emails2

Conflicts:
	db/structure.sql
	test/factories.rb
Merge branch 'master' into batch_welcome_emails2
Change format.
Remove file.
Add csv attachment; fix controller tests.
Add TCP links.
Fix controller tests.
Fix immediate param.
Remove commented code.
Tidy.
Tidy.
Remove puts.
Add comment.
Add comment.
Begin refactor.
Fix typo.
Remove local schemas.
Tidy template.