merge maurice changes
Bump pyon to include small proc shutdown fix
Updated test_resource_management_service.py function call
Merge pull request #433 from newbrough/preload_util

Preload util
Merge pull request #434 from seman/code_coverage

Updated test_resource_management_service.py function call
Bump pyon for resource agent get set logic.
Fix pubfreq agent parameters and tests. Inital agent alarm logic.
Added test convenience comment.
Bumped pyon and ion-defs
Bumped pyon for extended resource framework
Bumped pyon
Fix RR service test - changed impl

Conflicts:
	ion/services/sa/observatory/test/test_observatory_util.py
referencing latest in pyon and coverage
Commented out code which was clipping users in extended marince facility
Merge branch 'master' into notification_preferences_digest_realtime
fixed test_notification_preferences. but test needs more work
got test_notification_preferences working
all tests working. put in code so that the batch emails get sent only with the appropriate notification preferences set
Added to test_process_batch(). Test working. Fixed a missing import
added work to test_batch_notifications(). All test working