Added bindings to extended modifiers.
Restructuring to allow inclusion of ASTs in M3 model.
Changed keyword parameters to annotations.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git