Clean up package Makefile (it installed and removed too much).
Fixed image index generator to include all available image versions.