replace expect() with allow() in specs
refactor mailer code to make testing easier
fix specs
Merge pull request #130 from 18F/allow-expect

change usage of allow() to expect()
Merge remote-tracking branch 'origin/master' into proposals

Conflicts:
	spec/controllers/communicarts_controller_spec.rb