Strongly-typed image types (fixes #129)
Strongly-typed ServerState and ImageState (fixes #127)
Merge pull request #131 from sharwell/fix-127,129

Strongly-typed ImageType, ServerState, ImageState