Update setup.py
renaming some objects in the loading scripts to be compatible with previous changes
Update setup.py
Merge branch 'small_fixes' of https://github.com/jlerman44/ome into jlerman44-small_fixes
Merge branch 'jlerman44-small_fixes'