model template cleanup
whitespace cleanup
refactor model generator to require specifying of adapter type, major cleanup
update tests to handle required adapter specification for models