Various makefile tweaks
Outputting cases, serotype numbers in vaccine runs