Safer derivative checks.
Update comments.
Merge pull request #87 from Islandora/7.x-derivative-fixing

Safer derivative checks.