Moved more data code into the models and adjusted how sensors were handling sensortype_id.  sensortype is now an available variable for each sensor which returns actual sensortype name.