added abilty to ingest zipped images to existing book, coder cleanup
(cherry picked from commit c5f86c9245104b58f7a82095afaf15f4c093dc2a)
Code style cleanup.
Minor fixes.
Merge pull request #77 from jordandukart/7.x-cherry-alan

7.x cherry alan
Fix warning.
Merge pull request #78 from nigelgbanks/7.x-fix-warning

Fix warning