Merge pull request github#1030 from aripollak/calm-down-phrases

Fix bare phrases in calm-down

Author: tombell

src/scripts/calm-down.coffee

@@ -16,11 +16,8 @@ module.exports = (robot) ->
 
   robot.respond /manatee|calm( me)?/i, (msg) -> msg.send manatee()
 
-  robot.hear ///
-    (calm down)|
-    (simmer down)|
-    (that escalated quickly)
-  ///i, (msg) -> msg.send manatee()
+  robot.hear /calm down|simmer down|that escalated quickly/i, (msg) ->
+    msg.send manatee()
 
   unless process.env.HUBOT_LESS_MANATEES
     robot.hear ///