Add clarification for use of builder=freeimage
Merging formatting fixes for SqlReader and DiskCache