Merge pull request #7 from jordandukart/7.x

Refactoring and re-work for use in Islandora 7.