Integrate various fixes around finding model classes, including https://github.com/ctran/annotate_models/pull/82 and https://github.com/ctran/annotate_models/pull/85