Merge blacklist commit with upstream

lib/bot.js

@@ -203,7 +203,7 @@ Bot.prototype.listen = function () {
 
             // remove slack code block symbols
             var text = message.getBody();
-            // Note: opted NOT to remove single backticks ` 
+            // Note: opted NOT to remove single backticks `
             text = text.replace(/[\r\n\s]*```[\r\n\s]*(.*)[\r\n\s]*```[\r\n\s]*/,"\n$1\n")
             text = text.replace(/```(.*)```/,"  $1  ")
 
@@ -270,7 +270,7 @@ Bot.prototype.ircSpeak = function (channel, message, username) {
     message = self.entities.decode(message)
     message = self.prepareMessage(message)
 
-    // IRC max length is 512, minus the CR LF and other headers ... 
+    // IRC max length is 512, minus the CR LF and other headers ...
     //  In practice, it looks like this:
     //  :Nick!Ident@Host PRIVMSG #Powershell :Your Message Here
     //