Flake8 cleanups
Test OmeroMetadata.MapAnnotations
Fixes for bugs picked up by test_omero_metadata.py
Flake8 fixes