Merged in changes
Merge pull request #93 from Islandora/7.x-rename

Merged in changes