add .gitattributes to reduce merge-problems
removed a broken import
setup runtime test suite for m2