Coffee fix2

Fixed CLA issues (I think), and added additional commits to comply with @bajtos requests.
I'd rather keep all extension filtering in a single place and pass `files` to `loadModelDefinition`.