trio (EM, OS, intera) convergent created
Merge branch 'master' into InteraELMBarebones
EM compilable
functional EM-ELM working