Removed random swap file.
Mailer stuff for Ta test request
Doug's recommended changes for mailer
Merge branch 'master' of github.com:kernan/MOOC-TA-Management
Merge branch 'master' of https://github.com/kernan/MOOC-TA-Management into bootstrap

Conflicts:
	db/schema.rb