Addresses ISLANDORA-1139.
Removed debugging cruft.
Merge pull request #20 from mjordan/7.x

Address ISLANDORA-1139
Merge remote branch 'upstream/7.x' into flvc