Amaris FlowSight

See gh-1141.  This just adds a couple of commits to fix up the merge conflicts and a few minor style issues.

The only data file we have is in ```data_repo/from_skyking/imagestream```; it's a little odd in that there are upwards of 70000 series, but so far as I can tell from looking at the images, that's correct.  All seems fine otherwise on initial manual findbugs/test_per_commit/test_images_good tests.