fix seneca-mail 0.1.4 to avoid 0.1.6 nodemailer issue
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json