added missing import
use greenlet in simulator's event generator only when under pyon env; otherwise, regular thread. This fixes issue with using the simulator as an external process
removed an offending log warning
Merge pull request #346 from swarbhanu/remove_log_warning_uns

merged #346. According to Stephen's comment and Tim's during wrap up meeting, this log should be removed.
RR attachments now don't return content by default
Merge branch 'master' of github.com:ooici/coi-services
Merge pull request #347 from ooici/feature_attachment

Change RR read_attachment to optionally include content
Bumping pyon def to get Dave's fix in'
add fields to DataProduct preload
remove ridiculously verbose logging
merged ion defs with master
referring to latest in pyon
merged ion defs with master again
Merge branch 'master' into demo
KML generation clusters data products that are co-located
Merge branch 'master' of github.com:ooici/coi-services
update rollup return status and test"
Merge branch 'master' of github.com:ooici/coi-services
typo
bumped doc ID for preload