Merge ij2-ctr onto ij2

Merge remaining changes to use latest scifio.