Forgot to add this earlier - handles the actual emailing
Merge remote-tracking branch 'origin/master'