Begin a clean up
Break everything, clean a part of one thing
add a reminder comment
use more logical variable naming
Continue with the cleanup
Fix issues around instance naming
Add some basic handling for instance already exists
Begin refactoring of images.py
Continue the cleaning
Merge remote-tracking branch 'origin/refactor' into secretkey

* origin/refactor:
  Begin refactoring of images.py
Clean up zone.py