Cleanup and more readable code for MetaTerm and Keyword model

Remove submodule to see where it fails

Clarification and cleanup in the Keyword model

....argh ...

Reformatting meta term

finalize cleanup