Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision f2b977a645d9e52aa60db15b41b9f76312f7badb)
+++ Jenkinsfile	(revision d42fa1f514519cc9fb4940cd343d00cb423feaa0)
@@ -30,8 +30,10 @@
 	//send email notification
 
-	def email_subject = TokenMacro.expand( build, listener, email_subject_template );
-	def email_body = TokenMacro.expand( build, listener, email_body_template );
+	this.binding.variables.each {k,v -> echo "$k = $v"}
+
+	def email_subject = email_subject_template
+	def email_body = email_body_template
 	def email_to = 'tdelisle@uwaterloo.ca'
 
-	emailext body: email_body, subject: email_subject, to: email_to
+	emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
  }