Merge pull request #36 from thombrg/master

Added criteria directive and updated adopter grid to match adoptee grid delete action and column layout
Adoptee criteria rather than booleans
Renamed functions and attributes