fix csv export option handling
add mailer options

Conflicts:
	app/mailers/mailer.rb
	config/app_config.yml.SAMPLE