TODOs coming out of discussion with Tara
Merge branch 'master' of github.com:tillmo/DOL
heterogeneous environment and such
syntax of queries
moved concrete syntax to directly after abstract syntax
filtering
removed extraction and approx. methods
conversion to better EBNF; went through some ednotes; made syntax more coherent