Modified Sensors and Equipment Extensions

I created a new feature branch from the master and re-implemented
Amber’s Sensors extension plus all of the changes we made this morning
based on our meeting.  This should make it easier to merge back into
the Master branch.