phased out StatusType, it is now DeviceStatusType
working rollups, producing strange but technically correct results.  Resolved a messy merge.
Merge pull request #1067 from ifreecarve/2013-05-12_rollups

Rollups, up to and including Marine Facility