Modularize the mailer.
Fix bug in previous commit.
Merge branch 'master' into reservations

Conflicts:
	nrd/models/model.js