Merge branch 'master' into production

app/lib/surface/Label.coffee

@@ -15,7 +15,7 @@ module.exports = class Label extends CocoClass
     @sprite = options.sprite
     @camera = options.camera
     @layer = options.layer
-    @style = options.style ? Label.STYLE_SAY
+    @style = options.style ? (@sprite?.thang?.labelStyle || Label.STYLE_SAY)
     console.error @toString(), 'needs a sprite.' unless @sprite
     console.error @toString(), 'needs a camera.' unless @camera
     console.error @toString(), 'needs a layer.' unless @layer

app/lib/surface/Lank.coffee

@@ -684,7 +684,10 @@ module.exports = Lank = class Lank extends CocoClass
     return unless @thang
     blurb = if @thang.health <= 0 then null else @thang.sayMessage  # Dead men tell no tales
     blurb = null if blurb in ['For Thoktar!', 'Bones!', 'Behead!', 'Destroy!', 'Die, humans!']  # Let's just hear, not see, these ones.
-    labelStyle = if /Hero Placeholder/.test(@thang.id) then Label.STYLE_DIALOGUE else Label.STYLE_SAY
+    if /Hero Placeholder/.test(@thang.id)
+      labelStyle = Label.STYLE_DIALOGUE
+    else
+      labelStyle = @thang.labelStyle ? Label.STYLE_SAY
     @addLabel 'say', labelStyle if blurb
     if @labels.say?.setText blurb
       @notifySpeechUpdated blurb: blurb

server/queues/scoring/scoringUtils.coffee

@@ -44,13 +44,10 @@ module.exports.calculateSessionScores = (callback) ->
   sessionIDs = _.map @clientResponseObject.sessions, 'sessionID'
   async.map sessionIDs, retrieveOldSessionData.bind(@), (err, oldScores) =>
     if err? then return callback err, {error: 'There was an error retrieving the old scores'}
-    try
     oldScoreArray = _.toArray putRankingFromMetricsIntoScoreObject @clientResponseObject, oldScores
     newScoreArray = updatePlayerSkills oldScoreArray
     createSessionScoreUpdate.call @, scoreObject for scoreObject in newScoreArray
-      callback err, newScoreArray
-    catch e
-      callback e
+    callback null, newScoreArray
 
 retrieveOldSessionData = (sessionID, callback) ->
   formatOldScoreObject = (session) =>