Carry through changes from Islandora.
Merge pull request #67 from adam-vessey/7.x-constants

Carry through changes from Islandora.