Switch to the 'blueimip-gallery' plugin.
Minor random code cleanup.
Refactor source merge and improve test coverage.