Ddf extensible metacard

Merged all changes from master into the ddf-extensible-metacard.  Tested.  Ready to pull into master.