Merge branch 'master' of https://github.com/maxwellhadley/node-red-nodes

Conflicts:
	hardware/BBB/README.md

hardware/BBB/README.md

@@ -63,7 +63,6 @@ of the pulse, or by both edges. Two outputs are provided:
 Separate scaling factors are applied to each output. Output messages are generated
 at regular intervals, controlled by an internal timer. The count can be cleared
 or set to an arbitrary value by an input message who's topic contains 'load'.
-
 Useful for energy monitoring, e.g. electricty meter pulse outputs.
 
 The 'instantaneous' pulse rate is derived from either the time between the last two

hardware/sensorTag/79-sensorTag.js

@@ -51,7 +51,7 @@ function sensorTagNode(n) {
                 sensorTag.enableIrTemperature(function(){});
                 sensorTag.on('irTemperatureChange',
                 function(objectTemperature, ambientTemperature){
-                  var msg = {'topic': node.topic + '/tempature'};
+                  var msg = {'topic': node.topic + '/temperature'};
                   msg.payload = {'object': objectTemperature.toFixed(1),
                   'ambient':ambientTemperature.toFixed(1)
                   };