Updates to the update-images.py script and utilities

It might be nice to line wrap this for human readability, unless it is autogenerated? If it's autogenerated, it probably doesn't need to be checked in though, right?