Improve handling of CAA image types, fix Picard 350

This is an attempt to fix http://tickets.musicbrainz.org/browse/PICARD-350, i'm new to Picard and Python, so please review carefully.