doesn't raise exception for mail delivery failure on development
Merge branch 'master' of github.com:Coursemology/coursemology.org into development

Conflicts:
	db/schema.rb