Merge branch 'modular' of https://github.com/apdavison/nineml into removed_e_from_builtins
removed commented out line and temporary tests
added unit test for caret escape
Merge branch 'better_caret_escape'