Sensors extension final

Merging our work on the Sensors and Equipment extension over the past couple of weeks into the Master Branch.  It may not be quite complete, but we want to get it in there.