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

Carry through changes of Islandora constants.
use something a little more universal - this should probably be an actual setting somewhere?
Merge pull request #41 from ruebot/7.x

use something a little more universal
Merge remote branch 'upstream/7.x' into flvc