Changed UserRole object to reference org_name
Deploy and launch files for CEI launch generator
Merge pull request #249 from labisso/ceilaunchplan

Deploy and launch files for CEI launch generator
Adds buffer and time limits to ingestion management
OOIION-627 remove old compound assoc and change data product link in extended MFOrg
Add lightweight pydap service to r2deploy
Add lightweight pydap to alpha
Add event_persister singleton to alpha
Merge pull request #251 from jamie-cyber1/alpha_update

Update Alpha to include event persister singleton and lightweight pydap
Update alpha yml to include pyon config
Update nightly yml to include pyon config
Un-nest boot level for pydap
new service call for performance testing of graph rendering
Merge branch 'master' of https://github.com/ooici/ion-definitions
site_status computed attribute
Merge pull request #253 from ifreecarve/2012-12-21_site_status

site_status computed attribute
Added alarm events.
alarms to key off stream_name rather than stream_id
Add alarm ion objects.
Fixed name typo in alarm name. Fixed alarmdef default values.