Deals properly with environment for the or operator, next step is to extract out this logic for other boolean operations
Merge branch 'master' of github.com:cwi-swat/rascal