Merge pull request #7 from Islandora/7.x

7.x update
more error tests yes
Merge pull request #31 from qadan/7.x

more error tests!