move get_marine_facility_extension from OrgMgmtSvc to ObservatoryMgmtSvc along with extended resource defs
merge conflicet resolved in status_builder
defaults in absense of agent connectivity
comment re-added
merge changes from pre-revert state
proper bailout on instrument statues
change order of operations to see if UX is expecting the current device in this dict (they are not; change reverted)
set deployment_info dict properly
version bump to enable fixes to extended attrs
Merge pull request #1049 from ifreecarve/2012-05-07_computed_attrs

Status Rollups and other computed attributes
# This is a combination of 3 commits.
# The first commit's message is:
First pass at trend-test

# This is the 2nd commit message:

Adds tests to parsers to git index

# This is the 3rd commit message:

More work on types
Resolves some of the outstanding QC Work and some minor bug-fixes
Merge pull request #1021 from lukecampbell/qc

Reworks some of the QC stuff and adds test
agent schema ++
add da mode to schema
merge upstream/master