Merge pull request #750 from shenrie/master

Fixes for Marine Facility, UserInfo and generic extended resources
Merge pull request #751 from shenrie/master

Fix SMOKE test
CIDEVSA-486 - added alert config to agent launch
whitespace
Fixed alerts typo.
Added a conflict test in resource states.
Merge pull request #752 from ifreecarve/2013-03-21_agent_alert_config

CIDEVSA-486 - added alert config to agent launch
Added connect failed test.
OOps. Launch from egg.
Bump coverage-model
Merge pull request #755 from blazetopher/bump_cov

Bump coverage-model
bumped ion-defs
bumped pyon
Fix for extended data process definition