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.
Re-generate assets
Add csv attachment; fix controller tests.
Add TCP links.
Fix controller tests.
Fix immediate param.
Remove commented code.
Tidy.
Tidy.
Merge branch 'non_specific_amendments' into staging
Remove puts.
Add comment.
Add comment.
Begin refactor.
Fix typo.