Index: Jenkins/FullBuild
===================================================================
--- Jenkins/FullBuild	(revision f85464daf940aad4dbc7b6f91ad14388132747f8)
+++ Jenkins/FullBuild	(revision 13c98a4a0f6ef75648956b82730913c61e29aa8b)
@@ -27,6 +27,8 @@
 
 			//Push latest changes to do-lang repo
-			push_build()
+			// push_build()
 		}
+
+		promote_email(true)
 	}
 
@@ -43,5 +45,5 @@
 
 		//Send email to notify the failure
-		promote_failure_email()
+		promote_email(false)
 	}
 
@@ -92,31 +94,31 @@
 }
 
-def push_build() {
-	//Don't use the build_stage function which outputs the compiler
-	stage('Push') {
+// def push_build() {
+// 	//Don't use the build_stage function which outputs the compiler
+// 	stage('Push') {
 
-		status_prefix = 'Push'
+// 		status_prefix = 'Push'
 
-		def out_dir = pwd tmp: true
-		sh "mkdir -p ${out_dir}"
+// 		def out_dir = pwd tmp: true
+// 		sh "mkdir -p ${out_dir}"
 
-		//checkout the code to make sure this is a valid git repo
-		checkout scm
+// 		//checkout the code to make sure this is a valid git repo
+// 		checkout scm
 
-		collect_git_info()
+// 		collect_git_info()
 
-		//parse git logs to find what changed
-		sh "git remote > ${out_dir}/GIT_REMOTE"
-		git_remote = readFile("${out_dir}/GIT_REMOTE")
-		remoteDoLangExists = git_remote.contains("DoLang")
+// 		//parse git logs to find what changed
+// 		sh "git remote > ${out_dir}/GIT_REMOTE"
+// 		git_remote = readFile("${out_dir}/GIT_REMOTE")
+// 		remoteDoLangExists = git_remote.contains("DoLang")
 
-		if( !remoteDoLangExists ) {
-			sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
-		}
+// 		if( !remoteDoLangExists ) {
+// 			sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
+// 		}
 
-		//sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
-		echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
-	}
-}
+// 		//sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
+// 		echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
+// 	}
+// }
 
 //Helper routine to collect information about the git history
@@ -141,20 +143,24 @@
 
 //Email notification on a full build failure
-def promote_failure_email() {
+def promote_email(boolean success) {
 	echo('notifying users')
+
+	def result = success ? "PROMOTE - SUCCESS" : "PROMOTE - FAILURE"
 
 	//Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
 	//Configurations for email format
-	def email_subject = "[cforall git][PROMOTE - FAILURE]"
-	def email_body = """This is an automated email from the Jenkins build machine. It was
-generated because of a git hooks/post-receive script following
-a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
+	def email_subject = "[cforall git][${result}]"
+	def email_body = """<p>This is an automated email from the Jenkins build machine. It was
+generated following the result of the C∀ nightly build.</p>
 
-Check console output at ${env.BUILD_URL} to view the results.
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
 
-- Status --------------------------------------------------------------
+<p>- Status --------------------------------------------------------------</p>
 
-PROMOTE FAILURE
+<p>${result}</p>
+
+<p>- Performance --------------------------------------------------------------</p>
+
+<img src="https://cforall.uwaterloo.ca/jenkins/view/all/job/Plot%20Plugin%20Test/plot/getPlot?index=0" >
 """
 
@@ -162,4 +168,4 @@
 
 	//send email notification
-	emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
+	emailext body: email_body, subject: email_subject, to: email_to, attachLog: !success
 }
Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision f85464daf940aad4dbc7b6f91ad14388132747f8)
+++ Jenkinsfile	(revision 13c98a4a0f6ef75648956b82730913c61e29aa8b)
@@ -66,7 +66,5 @@
 	finally {
 		//Send email with final results if this is not a full build
-		if( Settings && !Settings.Silent ) {
-			email(log_needed, Settings.IsSandbox)
-		}
+		email(log_needed)
 
 		echo 'Build Completed'
@@ -200,23 +198,31 @@
 
 	return """
+<pre>
 The branch ${env.BRANCH_NAME} has been updated.
 ${gitUpdate}
-
-Check console output at ${env.BUILD_URL} to view the results.
-
-- Status --------------------------------------------------------------
-
-BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}
-
-- Log -----------------------------------------------------------------
+</pre>
+
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+
+<p>- Status --------------------------------------------------------------</p>
+
+<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+
+<p>- Log -----------------------------------------------------------------</p>
+
+<pre>
 ${gitLog}
------------------------------------------------------------------------
+</pre>
+
+<p>-----------------------------------------------------------------------</p>
+<pre>
 Summary of changes:
 ${gitDiff}
+</pre>
 """
 }
 
 //Standard build email notification
-def email(boolean log, boolean bIsSandbox) {
+def email(boolean log) {
 	//Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
 	//Configurations for email format
@@ -225,12 +231,12 @@
 	def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 	def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
-	def email_body = """This is an automated email from the Jenkins build machine. It was
+	def email_body = """<p>This is an automated email from the Jenkins build machine. It was
 generated because of a git hooks/post-receive script following
-a ref change which was pushed to the Cforall repository.
+a ref change which was pushed to the C∀ repository.</p>
 """ + GitLogMessage()
 
-	def email_to = "cforall@lists.uwaterloo.ca"
-
-	if( Settings && !Settings.IsSandbox ) {
+	def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
+
+	if( Settings && !Settings.Silent ) {
 		//send email notification
 		emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
Index: tools/PrettyGitLogs.sh
===================================================================
--- tools/PrettyGitLogs.sh	(revision f85464daf940aad4dbc7b6f91ad14388132747f8)
+++ tools/PrettyGitLogs.sh	(revision 13c98a4a0f6ef75648956b82730913c61e29aa8b)
@@ -27,3 +27,3 @@
 git rev-list --format=short ${GitOldRef}...${GitNewRef} >  ${GIT_LOG}
 
-git diff --stat ${GitNewRef} ${GitOldRef} >  ${GIT_DIFF}
+git diff --stat --color ${GitNewRef} ${GitOldRef} | sed -e 's/\[32m/<span style\=\"color\: \#00AA00\;\">/g' -e 's/\[31m/<span style\=\"color\: \#AA0000\;\">/g' -e 's/\[m/<\/span>/g' >  ${GIT_DIFF}