Updates to the update-images.py script and utilities

Hmmmmm, this if/else is a little funny because it seem like it will happen no matter what.