Enhanced instrument model OOI preload - more attributes
Enhanced OOI loader
Merge branch 'master' into ooiload

Conflicts:
	extern/ion-definitions
Merge pull request #945 from shenrie/master

Refactored all IMS policies to use XACML
Merge pull request #946 from shenrie/master

Fix regex match for policy operation names
Tests to verify CIDEVSA-472
Merge pull request #947 from ifreecarve/2013-04-16_CIDEVSA-472

Tests to verify CIDEVSA-472
fix OOIION-789: calling suspend_persist on an unpersisted data product raises exception
Enhanced preload - initial steps
change name of type param for alerts
explict label for b64 error
Merge pull request #948 from ifreecarve/2013-04-16_b64_error

explict label for b64 error
Preload treats definition categories now separately
Updates elasticpy
Added ability to script preload runs
Merge pull request #949 from lukecampbell/elasticpy

Updates elasticpy
Regex checking for h5stat version checking
Adds CEI skip decorators to test_coverage_types
Merge pull request #950 from lukecampbell/h5stat

Regex checking for h5stat version checking
Merge pull request #951 from lukecampbell/test_coverage_types

Test coverage types