mailer files
1: updated layout, fixed some rspec'ing configs

Conflicts:
	app/views/layouts/application.html.haml
	spec/spec_helper.rb