Finish off @mjordan's Islandora/islandora_batch/pull/25 and incorporate ...

...@willp87's idea.