#18 Changes to soften errors in bad OData models

Includes changes for #3 after upgrade to flake8/pep8